summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorDwight <dmerriman@gmail.com>2008-02-10 16:28:48 -0500
committerDwight <dmerriman@gmail.com>2008-02-10 16:28:48 -0500
commit329020083a639d04c052a1a46d8c25d908d74d06 (patch)
treee46c4433c691ffce57d69a170a4327f2cdd6cdda /util
parent43c52c96ad105efbe329b62ab7e54b0cb5e9f811 (diff)
downloadmongo-329020083a639d04c052a1a46d8c25d908d74d06.tar.gz
assertions etc.
Diffstat (limited to 'util')
-rw-r--r--util/goodies.h4
-rw-r--r--util/sock.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/util/goodies.h b/util/goodies.h
index 2eaa14d1e02..98aefd68981 100644
--- a/util/goodies.h
+++ b/util/goodies.h
@@ -41,8 +41,12 @@ inline void dumpmemory(const char *data, int len) {
}
}
+#undef yassert
#include <boost/thread/thread.hpp>
#include <boost/thread/xtime.hpp>
+#undef assert
+#define assert xassert
+#define yassert 1
struct WrappingInt {
WrappingInt() { x = 0; }
diff --git a/util/sock.h b/util/sock.h
index 9bd3088fc2d..cb392ad116f 100644
--- a/util/sock.h
+++ b/util/sock.h
@@ -1,7 +1,7 @@
// sock.h
-#pragma once
-
+#pragma once
+
#include <stdio.h>
#include <sstream>
#include "goodies.h"