assert: use our assert

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc
index ad256bb2bd373844ea4d3b7a3a8398919d24a382..67aedefb48d7cd1a6263461ae881e1cc5b0cf1d8 100644 (file)
--- a/src/auth/Crypto.cc
+++ b/src/auth/Crypto.cc
@@ -11,7 +11,6 @@
  * 
  */
 
-#include <assert.h>
 #include <sstream>
 #include "Crypto.h"
 #ifdef USE_CRYPTOPP
@@ -24,6 +23,7 @@
 # include <pk11pub.h>
 #endif
 
+#include "include/assert.h"
 #include "common/Clock.h"
 #include "common/armor.h"
 #include "common/ceph_crypto.h"

diff --git a/src/common/DoutStreambuf.cc b/src/common/DoutStreambuf.cc
index e568fed3107cc1326a93c4966b08fb8a4d76e778..3b82955e04fd757b425999cfbb0988a418bdf5a7 100644 (file)
--- a/src/common/DoutStreambuf.cc
+++ b/src/common/DoutStreambuf.cc
@@ -24,7 +24,6 @@
 #include "include/utime.h"
 
 #include <values.h>
-#include <assert.h>
 #include <errno.h>
 #include <fstream>
 #include <iostream>
@@ -35,6 +34,8 @@
 #include <string.h>
 #include <syslog.h>
 
+#include "include/assert.h"
+
 ///////////////////////////// Constants /////////////////////////////
 #define TIME_FMT "%04d-%02d-%02d %02d:%02d:%02d.%06ld"
 #define TIME_FMT_SZ 26

diff --git a/src/common/Thread.cc b/src/common/Thread.cc
index 1c76727d9984cac55896701334bdcb9d8514b12f..1d6a4f549a2c12908d32de5456a4030caa20efbe 100644 (file)
--- a/src/common/Thread.cc
+++ b/src/common/Thread.cc
@@ -17,7 +17,6 @@
 #include "common/debug.h"
 #include "common/signal.h"
 
-#include <assert.h>
 #include <dirent.h>
 #include <errno.h>
 #include <iostream>
@@ -29,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/user.h> // for PAGE_MASK
 
+
 Thread::
 Thread()
   : thread_id(0)

diff --git a/src/include/Context.h b/src/include/Context.h
index 8700f7325b2f1e6435690c8cf26f9b556cda9917..05fac8a79e49dda28d677a294e66fb3021f14e61 100644 (file)
--- a/src/include/Context.h
+++ b/src/include/Context.h
@@ -17,8 +17,8 @@
 #define CEPH_CONTEXT_H
 
 #include "common/dout.h"
+#include "include/assert.h"
 
-#include "assert.h"
 #include <list>
 #include <set>
 

diff --git a/src/include/assert.h b/src/include/assert.h
index d4a9f54350a7a0d0a1b6097253d0d33b8f8bdbc6..f3f60f57bab0227d94feee5798f82413bae0b8e9 100644 (file)
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -14,7 +14,7 @@
  * <assert.h> again later.
  */
 #ifndef NO_ATOMIC_OPS
-#include "atomic_ops.h"
+# include "atomic_ops.h"
 #endif
 
 struct CephContext;
@@ -114,3 +114,5 @@ using namespace ceph;
   ((expr)                                                              \
    ? __CEPH_ASSERT_VOID_CAST (0)                                       \
    : __ceph_assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION))
+
+#undef _ASSERT_H