summaryrefslogtreecommitdiff
path: root/secblock.h
diff options
context:
space:
mode:
authorweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2006-04-13 03:37:26 +0000
committerweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2006-04-13 03:37:26 +0000
commit5fba3a768ff0693aac237ec963f5cd7bed181db5 (patch)
treedee9766ff3f7b4b934026041a72123c0686bb3ee /secblock.h
parent82c4eb38804e011cfd855bc9e292f7533bfe4c2f (diff)
downloadcryptopp-5fba3a768ff0693aac237ec963f5cd7bed181db5.tar.gz
fix warning on VC6
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@220 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'secblock.h')
-rw-r--r--secblock.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/secblock.h b/secblock.h
index 1212208..3095d10 100644
--- a/secblock.h
+++ b/secblock.h
@@ -51,6 +51,12 @@ typedef typename AllocatorBase<T>::const_pointer const_pointer;\
typedef typename AllocatorBase<T>::reference 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>
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>
class AllocatorWithCleanup : public AllocatorBase<T>
{