fix warning on VC6
parent
6aacd0a0de
commit
7965f459e4
10
secblock.h
10
secblock.h
|
|
@ -51,6 +51,12 @@ typedef typename AllocatorBase<T>::const_pointer const_pointer;\
|
||||||
typedef typename AllocatorBase<T>::reference reference;\
|
typedef typename AllocatorBase<T>::reference reference;\
|
||||||
typedef typename AllocatorBase<T>::const_reference const_reference;
|
typedef typename AllocatorBase<T>::const_reference const_reference;
|
||||||
|
|
||||||
|
#if defined(_MSC_VER) && (_MSC_VER < 1300)
|
||||||
|
// this pragma causes an internal compiler error if placed immediately before std::swap(a, b)
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable: 4700) // VC60 workaround: don't know how to get rid of this warning
|
||||||
|
#endif
|
||||||
|
|
||||||
template <class T, class A>
|
template <class T, class A>
|
||||||
typename A::pointer StandardReallocate(A& a, T *p, typename A::size_type oldSize, typename A::size_type newSize, bool preserve)
|
typename A::pointer StandardReallocate(A& a, T *p, typename A::size_type oldSize, typename A::size_type newSize, bool preserve)
|
||||||
{
|
{
|
||||||
|
|
@ -73,6 +79,10 @@ typename A::pointer StandardReallocate(A& a, T *p, typename A::size_type oldSize
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(_MSC_VER) && (_MSC_VER < 1300)
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
class AllocatorWithCleanup : public AllocatorBase<T>
|
class AllocatorWithCleanup : public AllocatorBase<T>
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue