Guard on DEBUG_NEW and stub-out for precompiled headers

2016-10-02 03:10:06 -04:00 · 2016-10-02 03:10:06 -04:00 · fd278c2e8b
parent 8a6d18853d
commit fd278c2e8b
2 changed files with 8 additions and 2 deletions
--- a/algparam.h
+++ b/algparam.h
@ -459,7 +459,7 @@ public:
 		}
 	}

-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#if defined(DEBUG_NEW) && (_MSC_VER >= 1300)
 # pragma push_macro("new")
 # undef new
 #endif
@ -470,7 +470,7 @@ public:
 		CRYPTOPP_UNUSED(p);	// silence warning
 	}

-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#if defined(DEBUG_NEW) && (_MSC_VER >= 1300)
 # pragma pop_macro("new")
 #endif

--- a/pch.h
+++ b/pch.h
@ -21,4 +21,10 @@
 	#endif
 # endif

+// Enable file and line numbers, if available.
+// #if defined(_MSC_VER) && defined(_DEBUG) && defined(USE_PRECOMPILED_HEADERS)
+// # define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+// # define new DEBUG_NEW
+// #endif
+
 #endif	// CRYPTOPP_PCH_H