summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/ceph-dencoder/ceph_dencoder.cc2
-rw-r--r--src/tools/crushtool.cc2
-rw-r--r--src/tools/rbd/Utils.cc2
-rw-r--r--src/tools/rbd/action/Device.cc2
-rw-r--r--src/tools/rbd/action/Import.cc2
-rw-r--r--src/tools/rbd/action/MirrorPool.cc2
-rw-r--r--src/tools/rbd_mirror/PoolWatcher.h2
-rw-r--r--src/tools/rbd_mirror/image_deleter/RemoveRequest.cc2
-rw-r--r--src/tools/rbd_mirror/image_map/StateTransition.cc2
-rw-r--r--src/tools/rbd_mirror/image_map/Types.cc2
-rw-r--r--src/tools/rbd_mirror/instance_watcher/Types.cc2
-rw-r--r--src/tools/rbd_mirror/leader_watcher/Types.cc2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc
index 4abb93644d8..1f201ea78d0 100644
--- a/src/tools/ceph-dencoder/ceph_dencoder.cc
+++ b/src/tools/ceph-dencoder/ceph_dencoder.cc
@@ -22,7 +22,7 @@
#include "common/Formatter.h"
#include "common/errno.h"
#include "msg/Message.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#define TYPE(t)
#define TYPE_STRAYDATA(t)
diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 2080c7ba9a8..ce83562c3c3 100644
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -36,7 +36,7 @@
#include "crush/CrushWrapper.h"
#include "crush/CrushCompiler.h"
#include "crush/CrushTester.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#define dout_context g_ceph_context
#define dout_subsys ceph_subsys_crush
diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
index cdda59ebcec..1a4acbcb03f 100644
--- a/src/tools/rbd/Utils.cc
+++ b/src/tools/rbd/Utils.cc
@@ -2,7 +2,7 @@
// vim: ts=8 sw=2 smarttab
#include "tools/rbd/Utils.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#include "include/Context.h"
#include "include/encoding.h"
#include "common/common_init.h"
diff --git a/src/tools/rbd/action/Device.cc b/src/tools/rbd/action/Device.cc
index 8d7ca5d9bd1..3fdf2ef50aa 100644
--- a/src/tools/rbd/action/Device.cc
+++ b/src/tools/rbd/action/Device.cc
@@ -7,7 +7,7 @@
#include <boost/program_options.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
namespace rbd {
namespace action {
diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc
index 25a1670f5a7..f7205ee758e 100644
--- a/src/tools/rbd/action/Import.cc
+++ b/src/tools/rbd/action/Import.cc
@@ -17,7 +17,7 @@
#include <iostream>
#include <boost/program_options.hpp>
#include <boost/scoped_ptr.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#define dout_context g_ceph_context
#define dout_subsys ceph_subsys_rbd
diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc
index 6f4443d140c..8044816b866 100644
--- a/src/tools/rbd/action/MirrorPool.cc
+++ b/src/tools/rbd/action/MirrorPool.cc
@@ -18,7 +18,7 @@
#include <iostream>
#include <regex>
#include <boost/program_options.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#include <atomic>
diff --git a/src/tools/rbd_mirror/PoolWatcher.h b/src/tools/rbd_mirror/PoolWatcher.h
index d51b001700f..c9c17ff66f0 100644
--- a/src/tools/rbd_mirror/PoolWatcher.h
+++ b/src/tools/rbd_mirror/PoolWatcher.h
@@ -16,7 +16,7 @@
#include "types.h"
#include <boost/functional/hash.hpp>
#include <boost/optional.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#include "tools/rbd_mirror/pool_watcher/Types.h"
namespace librbd { struct ImageCtx; }
diff --git a/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc b/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc
index b537f719765..36f06866fe0 100644
--- a/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc
+++ b/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc
@@ -2,7 +2,7 @@
// vim: ts=8 sw=2 smarttab
#include "tools/rbd_mirror/image_deleter/RemoveRequest.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#include "common/debug.h"
#include "common/errno.h"
#include "common/WorkQueue.h"
diff --git a/src/tools/rbd_mirror/image_map/StateTransition.cc b/src/tools/rbd_mirror/image_map/StateTransition.cc
index 6e7746fc84b..ec5f07ff995 100644
--- a/src/tools/rbd_mirror/image_map/StateTransition.cc
+++ b/src/tools/rbd_mirror/image_map/StateTransition.cc
@@ -2,7 +2,7 @@
// vim: ts=8 sw=2 smarttab
#include <ostream>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#include "StateTransition.h"
namespace rbd {
diff --git a/src/tools/rbd_mirror/image_map/Types.cc b/src/tools/rbd_mirror/image_map/Types.cc
index 6fdbad00721..47de9c3cf59 100644
--- a/src/tools/rbd_mirror/image_map/Types.cc
+++ b/src/tools/rbd_mirror/image_map/Types.cc
@@ -2,7 +2,7 @@
// vim: ts=8 sw=2 smarttab
#include "Types.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#include "include/stringify.h"
#include "common/Formatter.h"
#include <iostream>
diff --git a/src/tools/rbd_mirror/instance_watcher/Types.cc b/src/tools/rbd_mirror/instance_watcher/Types.cc
index 8dbf91220c7..0e992273372 100644
--- a/src/tools/rbd_mirror/instance_watcher/Types.cc
+++ b/src/tools/rbd_mirror/instance_watcher/Types.cc
@@ -2,7 +2,7 @@
// vim: ts=8 sw=2 smarttab
#include "Types.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#include "include/stringify.h"
#include "common/Formatter.h"
diff --git a/src/tools/rbd_mirror/leader_watcher/Types.cc b/src/tools/rbd_mirror/leader_watcher/Types.cc
index a767db8d7a7..d2fb7908fa4 100644
--- a/src/tools/rbd_mirror/leader_watcher/Types.cc
+++ b/src/tools/rbd_mirror/leader_watcher/Types.cc
@@ -2,7 +2,7 @@
// vim: ts=8 sw=2 smarttab
#include "Types.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
#include "include/stringify.h"
#include "common/Formatter.h"