Guard on DEBUG_NEW and stub-out for precompiled headers

weidai11 · Oct 2, 2016 · fd278c2 · fd278c2 · noloader · Oct 2, 2016
1 parent 8a6d188
commit fd278c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/algparam.h b/algparam.h
@@ -459,7 +459,7 @@ class AlgorithmParametersTemplate : public AlgorithmParametersBase
 		}
 	}
 
-#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 @@ class AlgorithmParametersTemplate : public AlgorithmParametersBase
 		CRYPTOPP_UNUSED(p);	// silence warning
 	}
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#if defined(DEBUG_NEW) && (_MSC_VER >= 1300)
 # pragma pop_macro("new")
 #endif
 

diff --git 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