summaryrefslogtreecommitdiff
path: root/src/mongo/util/goodies.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/util/goodies.h')
-rw-r--r--src/mongo/util/goodies.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mongo/util/goodies.h b/src/mongo/util/goodies.h
index c2ca29a24e5..6683ee189f9 100644
--- a/src/mongo/util/goodies.h
+++ b/src/mongo/util/goodies.h
@@ -18,8 +18,8 @@
#pragma once
-#include "../bson/util/misc.h"
#include "concurrency/mutex.h"
+#include "../bson/util/misc.h"
namespace mongo {
@@ -112,9 +112,6 @@ namespace mongo {
#define MONGO_FLOG log() << __FILE__ ":" << __LINE__ << endl
#define FLOG MONGO_FLOG
-#undef assert
-#define assert MONGO_assert
-
inline bool startsWith(const char *str, const char *prefix) {
size_t l = strlen(prefix);
if ( strlen(str) < l ) return false;
@@ -150,7 +147,7 @@ namespace mongo {
#if !defined(_WIN32)
typedef int HANDLE;
inline void strcpy_s(char *dst, unsigned len, const char *src) {
- assert( strlen(src) < len );
+ verify( strlen(src) < len );
strcpy(dst, src);
}
#else