make everyone use our assert #include and macro

...as detected by the previous patch.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc
index c52761d46c81fdd20ca20e2b2f57587360d2a0d6..da7dbf17de7ae8d8d862818da30bcfdb9549c6e4 100644 (file)
--- a/src/auth/cephx/CephxServiceHandler.cc
+++ b/src/auth/cephx/CephxServiceHandler.cc
@@ -24,6 +24,7 @@
 #include <sstream>
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_auth
 #undef dout_prefix

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 179aa4529d0fc38dfdc98db7ef475842a35b2809..8d73283563da9a6e2e441bfbcac466cf2251a5dc 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -45,6 +45,8 @@ using namespace std;
 
 #include "auth/KeyRing.h"
 
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_mds
 
 void usage()

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 14a776af374fe2336ad69a7f0b7f7828528a852f..4b429eca2ee51c0f4a52a1fe7c8cf4f37bfcee9d 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -41,6 +41,8 @@ using namespace std;
 #include "global/global_init.h"
 #include "global/signal_handler.h"
 
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_mon
 
 extern CompatSet get_ceph_mon_feature_compat_set();

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 484bf942eaf8b9a5a3bff953384669dc04a2ced5..588dcaced479a7553722723f21e0ae9fb5d7a105 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -46,6 +46,8 @@ using namespace std;
 
 #include "perfglue/heap_profiler.h"
 
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_osd
 
 OSD *osd = NULL;

diff --git a/src/client/Client.cc b/src/client/Client.cc
index d245edb055dd4227a71a703b43401878b325d740..ceda0e355b4adce9b20a0cba71f52151c840d99c 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -82,6 +82,8 @@ using namespace std;
 #include "MetaRequest.h"
 #include "ObjecterWriteback.h"
 
+#include "include/assert.h"
+
 #undef dout_prefix
 #define dout_prefix *_dout << "client." << whoami << " "
 

diff --git a/src/client/Inode.h b/src/client/Inode.h
index f7c26d91e2276c5391c541a1593165b85e483b19..b196d53ef9e381d0c1c8ecece439e395d66f59a6 100644 (file)
--- a/src/client/Inode.h
+++ b/src/client/Inode.h
@@ -8,6 +8,7 @@
 #include "mds/mdstypes.h" // hrm
 
 #include "osdc/ObjectCacher.h"
+#include "include/assert.h"
 
 class MetaSession;
 class Dentry;

diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc
index e73899df97c2fd82f2de60054e4e80718e32511e..858e23dea387ae55f392e5f4959a474a88c4fd35 100644 (file)
--- a/src/client/SyntheticClient.cc
+++ b/src/client/SyntheticClient.cc
@@ -35,6 +35,7 @@ using namespace std;
 #include <sys/statvfs.h>
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_client
 #undef dout_prefix

diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc
index 48e8587fcc3a1318f1cdec2ba24c88a5b91a27e2..00a62714d6896fc4932ca601da57127b495c17fd 100644 (file)
--- a/src/client/fuse_ll.cc
+++ b/src/client/fuse_ll.cc
@@ -29,6 +29,7 @@
 #include "include/types.h"
 #include "Client.h"
 #include "common/config.h"
+#include "include/assert.h"
 
 static Client *client;
 

diff --git a/src/common/ceph_crypto.h b/src/common/ceph_crypto.h
index 32961616e6cd84710539e6e2e27931cda16044bd..52b98b83a6392ef63a839fa9704bd6287b7d1398 100644 (file)
--- a/src/common/ceph_crypto.h
+++ b/src/common/ceph_crypto.h
@@ -48,7 +48,7 @@ namespace ceph {
 // the crypto operations. We don't want to contaminate too much code
 // with error checking, and just say these really should never fail.
 // This assert MUST NOT be compiled out, even on non-debug builds.
-# include "assert.h"
+# include "include/assert.h"
 
 // ugly bit of CryptoPP that we have to emulate here :(
 typedef unsigned char byte;

diff --git a/src/common/config.h b/src/common/config.h
index 70731beb9c5707c051873cdba9fdc1f3114bf234..53120224e61513535460792dd973c8507f1568bc 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -26,7 +26,6 @@ extern struct ceph_file_layout g_default_file_layout;
 #include "common/entity_name.h"
 #include "common/Mutex.h"
 #include "log/SubsystemMap.h"
-#include "include/assert.h" // TODO: remove
 #include "common/config_obs.h"
 #include "msg/msg_types.h"
 

diff --git a/src/crushtool.cc b/src/crushtool.cc
index e55338e52585630339d3708ef6f73949dca96b9c..b836cb464c4593b73550e9fa712bb757bdfff747 100644 (file)
--- a/src/crushtool.cc
+++ b/src/crushtool.cc
@@ -19,6 +19,8 @@
 
 #include <sys/stat.h>
 
+#include <fstream>
+
 #include "common/debug.h"
 #include "common/errno.h"
 #include "common/config.h"
@@ -29,8 +31,7 @@
 #include "crush/CrushWrapper.h"
 #include "crush/CrushCompiler.h"
 #include "crush/CrushTester.h"
-
-#include <fstream>
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_crush
 

diff --git a/src/include/encoding.h b/src/include/encoding.h
index 2db2a4224fab8b590f66bf7faa9ad8f486deb651..97f1b207327569ae70518abf1bae4b0489fa027b 100644 (file)
--- a/src/include/encoding.h
+++ b/src/include/encoding.h
@@ -15,14 +15,14 @@
 #ifndef CEPH_ENCODING_H
 #define CEPH_ENCODING_H
 
+#include <tr1/memory>
+
 #include "inttypes.h"
 #include "byteorder.h"
 #include "buffer.h"
 
 using namespace ceph;
 
-#include <tr1/memory>
-
 /*
  * Notes on feature encoding:
  *

diff --git a/src/include/frag.h b/src/include/frag.h
index 7e25712fbb685404b886857b3163c9544faead09..a609833db9a48d67aa6423d4614ced5ad2aad82c 100644 (file)
--- a/src/include/frag.h
+++ b/src/include/frag.h
@@ -24,6 +24,7 @@
 #include "buffer.h"
 
 #include "ceph_frag.h"
+#include "include/assert.h"
 
 /*
  * 

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index e4fbf6a29201a8d76513ae4719c4d055a2dea0e4..b83677551a15f2271b0c6ef3bb4675e2acdc2f46 100644 (file)
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -12,6 +12,11 @@
  *
  */
 
+#include <fcntl.h>
+#include <iostream>
+#include <string.h>
+#include <string>
+
 #include "client/Client.h"
 #include "include/cephfs/libcephfs.h"
 #include "common/Mutex.h"
@@ -23,11 +28,7 @@
 #include "include/str_list.h"
 #include "messages/MMonMap.h"
 #include "msg/Messenger.h"
-
-#include <fcntl.h>
-#include <iostream>
-#include <string.h>
-#include <string>
+#include "include/assert.h"
 
 class ceph_mount_info
 {

diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
index 21689c287503ad1dc5dbe9f12ad4d04b614b9adb..3eea6b4a1f97230e2a328ce73ca4c4adb12717aa 100644 (file)
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@ -12,13 +12,14 @@
  *
  */
 
+#include <limits.h>
+
 #include "IoCtxImpl.h"
 
 #include "librados/AioCompletionImpl.h"
 #include "librados/PoolAsyncCompletionImpl.h"
 #include "librados/RadosClient.h"
-
-#include <limits.h>
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_rados
 #undef dout_prefix

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 17db7676330d8f075ddbf71fc574138921fc692f..0a08a3b82628b6b2a1df4b809fb40e471a72f7ff 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -36,6 +36,8 @@
 #include "PoolAsyncCompletionImpl.h"
 #include "RadosClient.h"
 
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_rados
 #undef dout_prefix
 #define dout_prefix *_dout << "librados: "

diff --git a/src/librbd/LibrbdWriteback.cc b/src/librbd/LibrbdWriteback.cc
index e7d810001d48a66df56efc8d20dd79b6226ee435..9fac5aba5ac8c7186308a8b836373e8cb90befaf 100644 (file)
--- a/src/librbd/LibrbdWriteback.cc
+++ b/src/librbd/LibrbdWriteback.cc
@@ -8,6 +8,8 @@
 
 #include "LibrbdWriteback.h"
 
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix
 #define dout_prefix *_dout << "librbdwriteback: "

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index d6e35e55f53d0f41e782acea32900d5dacac1a8a..6761c6ffffd56cb168ac25b47a2545e9fb5c0e65 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -34,6 +34,7 @@
 #include "osdc/Objecter.h"
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 70faeb815970981315677ff536bff06ae75335d4..86c8179f8c114947c4d1a660be02ee8e0c61ded0 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -12,6 +12,10 @@
  * 
  */
 
+#include <inttypes.h>
+#include <string>
+#include <stdio.h>
+
 #include "CInode.h"
 #include "CDir.h"
 #include "CDentry.h"
@@ -35,12 +39,9 @@
 #include "messages/MLock.h"
 #include "messages/MClientCaps.h"
 
-#include <inttypes.h>
-#include <string>
-#include <stdio.h>
-
 #include "common/config.h"
 #include "global/global_context.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 143facaf7b1d4c17081ede4eef295c29824bbfe1..ca19760b1a7c8ec2656406a0b23f238845b60d96 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12,7 +12,12 @@
  * 
  */
 
-
+#include <errno.h>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <map>
 
 #include "MDCache.h"
 #include "MDS.h"
@@ -86,17 +91,12 @@
 
 #include "common/Timer.h"
 
-#include <errno.h>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <map>
 using namespace std;
 
 extern struct ceph_file_layout g_default_file_layout;
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 294ad53961caa4ab4059b542589ae334eb58c78d..cac5615cbff3c53b8ac1e7ebfc15148783bbe228 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -26,6 +26,7 @@
 
 #include "common/config.h"
 #include "common/errno.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef DOUT_COND

diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc
index 308a9e5d65a71dc8778c9f5aa17ad4ef028f26f8..ed08f25ac9493e1adc6bd3ecc653811730cf0162 100644 (file)
--- a/src/mds/MDSTable.cc
+++ b/src/mds/MDSTable.cc
@@ -22,6 +22,7 @@
 #include "include/types.h"
 
 #include "common/config.h"
+#include "include/assert.h"
 
 
 #define dout_subsys ceph_subsys_mds

diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index c2d348951eec5d33574e74877a5b0af447e10ee4..af150f1f6b939cb460a7defa5ff92b7b82922aba 100644 (file)
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -18,6 +18,7 @@
 #include "osdc/Filer.h"
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix

diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index 4ce1f776e3b1883be697f3ac2dbd4002c01cff79..d15c6ad9dbf51745791c2bdd5b553873af2c0ad6 100644 (file)
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -24,6 +24,7 @@
 #include "msg/Messenger.h"
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index cf71fc5fb4c899535f3b89333c7e7ae2dcbfd734..df7ce5532204b2a9869c7f8d07d672a8e760704e 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -12,6 +12,7 @@
  * 
  */
 
+#include <sstream>
 
 #include "AuthMonitor.h"
 #include "Monitor.h"
@@ -31,7 +32,7 @@
 #include "osd/osd_types.h"
 
 #include "common/config.h"
-#include <sstream>
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index cc25cba82a2e18d17aa37eb46906205180525608..7c7bb5c2c71e0b162123f314a0e3ac1100477ba8 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -21,6 +21,7 @@
 #include "messages/MMonElection.h"
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index d8bf82ebe34937132831606a7dee3a4cb59d4afd..f3dc1fcd13ad6af154115deb1c2d8181dae2f958 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -28,6 +28,7 @@
 #include "osd/osd_types.h"
 #include "common/errno.h"
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 5647539d68621064b995c17601eb078a12f73e5f..2fb9603a4ce3de5908d045607a5791348edc3d38 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -34,6 +34,7 @@
 #include <sstream>
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 3f2f287e08afdeba8720a8d92e76e02e5d764c04..3c10e318c56c1b906c3687d5c2c3f40c00c36618 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -12,6 +12,11 @@
  * 
  */
 
+
+#include <sstream>
+#include <stdlib.h>
+#include <signal.h>
+
 #include "Monitor.h"
 
 #include "osd/OSDMap.h"
@@ -64,10 +69,7 @@
 #include "auth/KeyRing.h"
 
 #include "common/config.h"
-
-#include <sstream>
-#include <stdlib.h>
-#include <signal.h>
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index ec5b0e3873de0f0e62660cfcfd430e081006b93d..845bbbdbfc9ede09f33ba5f7d6a8bd1b1acf46bd 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -27,6 +27,7 @@
 
 #include <sstream>
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 86896809d0b384cc256e1a1507f3a2bed86d027d..28fc40acb0b1adcd0384215bbcdc76eb4b06e472 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -12,6 +12,8 @@
  * 
  */
 
+#include <sstream>
+
 #include "OSDMonitor.h"
 #include "Monitor.h"
 #include "MDSMonitor.h"
@@ -42,8 +44,7 @@
 #include "common/errno.h"
 
 #include "include/compat.h"
-
-#include <sstream>
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 861a6bfcbf1b6f51830e135e6e42689e04ea6e6f..ce10de3c5f0d7e139301add17247bcad71a81aff 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -19,6 +19,7 @@
 #include "messages/MMonPaxos.h"
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_paxos
 #undef dout_prefix

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 38fbceab22124d140327eb3e93b877a1c5d59b4b..167781bc766ea21c7b2c443240e21e3b1475994b 100644 (file)
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -16,9 +16,8 @@
 #include "common/Clock.h"
 #include "Monitor.h"
 
-
-
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_paxos
 #undef dout_prefix

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 75cc6792188b7bf69cabe74b7e47eeec56ec9e4d..2a3fd55bc6a4b4bbef77a2af5b9ad93f335c673e 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -34,6 +34,7 @@ using namespace __gnu_cxx;
 #include "Messenger.h"
 #include "Message.h"
 #include "tcp.h"
+#include "include/assert.h"
 
 
 /*

diff --git a/src/os/DBObjectMap.cc b/src/os/DBObjectMap.cc
index 9c92505c82748ad599c7d4ac4b27f5600d94e6a0..9163ff604e082971b6435e58236466d3018ef0bd 100644 (file)
--- a/src/os/DBObjectMap.cc
+++ b/src/os/DBObjectMap.cc
@@ -19,6 +19,8 @@
 
 #include "common/debug.h"
 #include "common/config.h"
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_filestore
 #undef dout_prefix
 #define dout_prefix *_dout << "filestore "

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 254bbfccfff34651662a96c66aa3dca37d10e598..cb030594cf51141a48e2f9190223032a7978a842 100644 (file)
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -9,6 +9,7 @@
 #include "msg/Message.h"
 #include "messages/MOSDOp.h"
 #include "messages/MOSDSubOp.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_optracker
 #undef dout_prefix

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 57b70ce6a308ae3d96f4d768e4c438637bf4fa7e..0345bc15dd303b60eb4dd1f4dad55e37cfc47151 100644 (file)
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -18,6 +18,7 @@
 #include "msg/Messenger.h"
 #include "osdc/Journaler.h"
 #include "common/errno.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index d03ff4545477e956f1d5f677be76a91e2fcc74bc..a9f8d8aeefc4e55e2a197062313042117468b945 100644 (file)
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -1,13 +1,15 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
 // vim: ts=8 sw=2 smarttab
 
+#include <limits.h>
+
 #include "msg/Messenger.h"
 #include "ObjectCacher.h"
 #include "WritebackHandler.h"
 #include "common/errno.h"
 #include "common/perf_counters.h"
 
-#include <limits.h>
+#include "include/assert.h"
 
 /*** ObjectCacher::BufferHead ***/
 

diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
index 1d55bb45e10d6df98bf4d086c23bdc510b9bb434..1cc319b1fa3f8ab0eb8a1c3bd2998a8585fb2522 100644 (file)
--- a/src/rgw/rgw_cache.h
+++ b/src/rgw/rgw_cache.h
@@ -6,6 +6,7 @@
 #include <map>
 #include "include/types.h"
 #include "include/utime.h"
+#include "include/assert.h"
 
 enum {
   UPDATE_OBJ,

diff --git a/src/test/encoding/ceph_dencoder.cc b/src/test/encoding/ceph_dencoder.cc
index 68d1ca8ae0a303fac4c2deab5d3f4d3d4a75293f..bdc4e31996a9c442d6471cd61f6fa373e2fa67ca 100644 (file)
--- a/src/test/encoding/ceph_dencoder.cc
+++ b/src/test/encoding/ceph_dencoder.cc
@@ -7,6 +7,7 @@
 #include "common/Formatter.h"
 #include "common/errno.h"
 #include "msg/Message.h"
+#include "include/assert.h"
 
 #define TYPE(t)
 #define TYPEWITHSTRAYDATA(t)

diff --git a/src/test/filestore/DeterministicOpSequence.cc b/src/test/filestore/DeterministicOpSequence.cc
index 568cf2f40bed2bb4cbf6e078ce895be5cf4d8296..cbfb0e4cdc6bf11f6e995beae04758a398bf3f24 100644 (file)
--- a/src/test/filestore/DeterministicOpSequence.cc
+++ b/src/test/filestore/DeterministicOpSequence.cc
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <iostream>
 #include <fstream>
-#include <assert.h>
 #include <time.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -29,6 +28,7 @@
 #include "DeterministicOpSequence.h"
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_filestore
 #undef dout_prefix

diff --git a/src/test/filestore/TestFileStoreState.cc b/src/test/filestore/TestFileStoreState.cc
index 4339c5ca6530b28cc552e0dca652d0ba6a34503d..b8ce898efe799771ed02f9326c08468b3c331bc5 100644 (file)
--- a/src/test/filestore/TestFileStoreState.cc
+++ b/src/test/filestore/TestFileStoreState.cc
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <iostream>
-#include <assert.h>
 #include <time.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -24,6 +23,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/lexical_cast.hpp>
 #include "TestFileStoreState.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_filestore
 #undef dout_prefix

diff --git a/src/test/filestore/test_idempotent_sequence.cc b/src/test/filestore/test_idempotent_sequence.cc
index 9d8f46abc91592ace0337bc415d4d098a3914032..818a2554c352844a8f3dcc89f88e523305cda90a 100644 (file)
--- a/src/test/filestore/test_idempotent_sequence.cc
+++ b/src/test/filestore/test_idempotent_sequence.cc
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <iostream>
 #include <sstream>
-#include <assert.h>
 #include <time.h>
 #include <stdlib.h>
 #include "common/ceph_argparse.h"
@@ -26,6 +25,7 @@
 #include "FileStoreDiff.h"
 
 #include "common/config.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_
 #undef dout_prefix

diff --git a/src/test/filestore/workload_generator.cc b/src/test/filestore/workload_generator.cc
index da181612aeed6698eff8ff4396ddd59393ed128b..4dd23ef40fa14ff5fbc9f3974f24210a6cd22458 100644 (file)
--- a/src/test/filestore/workload_generator.cc
+++ b/src/test/filestore/workload_generator.cc
@@ -28,6 +28,7 @@
 #include <boost/lexical_cast.hpp>
 #include "workload_generator.h"
 #include "common/debug.h"
+#include "include/assert.h"
 
 #include "TestFileStoreState.h"
 

diff --git a/src/test_trans.cc b/src/test_trans.cc
index 6c3d2d65695297f9ed34622401790d58ff8e0a03..43821c13aecc38f7283c27b50988222597878ded 100644 (file)
--- a/src/test_trans.cc
+++ b/src/test_trans.cc
@@ -17,6 +17,7 @@
 #include "common/debug.h"
 #include "os/FileStore.h"
 #include "global/global_init.h"
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_filestore
 #undef dout_prefix

diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index 8e824c79de7aef95bc74c15a4886abfc474ab50c..b799a0610d183e82359846ebb035849418b3d652 100644 (file)
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -13,14 +13,6 @@
  *
  */
 
-#include "common/ceph_argparse.h"
-#include "global/global_init.h"
-#include "common/errno.h"
-#include "common/safe_io.h"
-#include "common/config.h"
-#include "tools/common.h"
-
-#include "include/compat.h"
 
 #include <limits.h>
 #include <errno.h>
@@ -35,6 +27,16 @@
 #include <unistd.h>
 #include <string.h>
 
+#include "common/ceph_argparse.h"
+#include "global/global_init.h"
+#include "common/errno.h"
+#include "common/safe_io.h"
+#include "common/config.h"
+#include "tools/common.h"
+
+#include "include/compat.h"
+#include "include/assert.h"
+
 using std::vector;
 
 void do_status(CephToolCtx *ctx, bool shutdown = false);

diff --git a/src/tools/common.cc b/src/tools/common.cc
index 3b1cb741df2e54b25696809f01630fe1c0d9c6c9..845332dd7c48060a302cd3442eabbfd1af276a62 100644 (file)
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -17,6 +17,19 @@
 #include <string>
 using namespace std;
 
+#if !defined(DARWIN) && !defined(__FreeBSD__)
+#include <envz.h>
+#endif // DARWIN
+
+#include <memory>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+extern "C" {
+#include <histedit.h>
+}
+
 #include "acconfig.h"
 #include "messages/MMonCommand.h"
 #include "messages/MMonCommandAck.h"
@@ -33,18 +46,8 @@ using namespace std;
 #include "common/Timer.h"
 #include "global/global_init.h"
 
-#if !defined(DARWIN) && !defined(__FreeBSD__)
-#include <envz.h>
-#endif // DARWIN
-
-#include <memory>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 
-extern "C" {
-#include <histedit.h>
-}
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_