diff options
| -rw-r--r-- | client/redef_macros.h | 1 | ||||
| -rw-r--r-- | client/undef_macros.h | 2 | ||||
| -rw-r--r-- | stdafx.h | 2 | ||||
| -rw-r--r-- | util/assert_util.h | 2 | ||||
| -rw-r--r-- | util/goodies.h | 3 |
5 files changed, 0 insertions, 10 deletions
diff --git a/client/redef_macros.h b/client/redef_macros.h index 392bf234a57..a05bb57068a 100644 --- a/client/redef_macros.h +++ b/client/redef_macros.h @@ -32,7 +32,6 @@ #pragma pop_macro("massert") #pragma pop_macro("uassert") #pragma pop_macro("wassert") -#pragma pop_macro("yassert") #pragma pop_macro("xassert") #pragma pop_macro("ASSERT_ID_DUPKEY") #pragma pop_macro("ASSERT_STREAM_GOOD") diff --git a/client/undef_macros.h b/client/undef_macros.h index 9c14c9bff81..ca3c6b69bb4 100644 --- a/client/undef_macros.h +++ b/client/undef_macros.h @@ -39,8 +39,6 @@ #undef uassert #pragma push_macro("wassert") #undef wassert -#pragma push_macro("yassert") -#undef yassert #pragma push_macro("xassert") #undef xassert #pragma push_macro("ASSERT_ID_DUPKEY") @@ -96,7 +96,6 @@ namespace mongo { ///using namespace std; -#undef yassert #include <boost/archive/iterators/base64_from_binary.hpp> #include <boost/archive/iterators/binary_from_base64.hpp> #include <boost/archive/iterators/transform_width.hpp> @@ -127,7 +126,6 @@ namespace mongo { #include <boost/thread/xtime.hpp> #undef assert #define assert xassert -#define yassert 1 namespace mongo { using namespace boost::filesystem; diff --git a/util/assert_util.h b/util/assert_util.h index 0ca44a6b02e..cb5534a239d 100644 --- a/util/assert_util.h +++ b/util/assert_util.h @@ -165,8 +165,6 @@ namespace mongo { #define xassert(_Expression) (void)( (!!(_Expression)) || (mongo::asserted(#_Expression, __FILE__, __LINE__), 0) ) -#define yassert 1 - /* warning only - keeps going */ #define wassert(_Expression) (void)( (!!(_Expression)) || (mongo::wasserted(#_Expression, __FILE__, __LINE__), 0) ) diff --git a/util/goodies.h b/util/goodies.h index 8cc656ac9b7..50355c70cd0 100644 --- a/util/goodies.h +++ b/util/goodies.h @@ -105,11 +105,8 @@ namespace mongo { // PRINTFL; prints file:line #define PRINTFL cout << __FILE__ ":" << __LINE__ << endl -#undef yassert - #undef assert #define assert xassert -#define yassert 1 struct WrappingInt { WrappingInt() { |