mirror of
https://github.com/mongodb/mongo.git
synced 2024-12-01 09:32:32 +01:00
Remove yassert
This commit is contained in:
parent
1a27750682
commit
ae303a06c5
@ -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")
|
||||
|
@ -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")
|
||||
|
2
stdafx.h
2
stdafx.h
@ -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;
|
||||
|
@ -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) )
|
||||
|
||||
|
@ -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() {
|
||||
|
Loading…
Reference in New Issue
Block a user