From cf862c65fd54ebdcc9fa7cb29bfb32779a7631fc Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 31 Aug 2011 09:54:21 -0700
Subject: [PATCH] assert: use our assert

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/auth/Crypto.cc          | 2 +-
 src/common/DoutStreambuf.cc | 3 ++-
 src/common/Thread.cc        | 2 +-
 src/include/Context.h       | 2 +-
 src/include/assert.h        | 4 +++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc
index ad256bb2bd373..67aedefb48d7c 100644
--- 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 e568fed3107cc..3b82955e04fd7 100644
--- 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 1c76727d9984c..1d6a4f549a2c1 100644
--- 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 8700f7325b2f1..05fac8a79e49d 100644
--- 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 d4a9f54350a7a..f3f60f57bab02 100644
--- 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
-- 
2.39.5