update sources to v12.1.0

[ceph.git] / ceph / src / test / journal / test_Journaler.cc

diff --git a/ceph/src/test/journal/test_Journaler.cc b/ceph/src/test/journal/test_Journaler.cc
index 4fd06ad6535f52674f686a812dc9081e5c3c8b5e..529141de9a3078b237a53d6c51a3ec15f332c471 100644 (file)
--- a/ceph/src/test/journal/test_Journaler.cc
+++ b/ceph/src/test/journal/test_Journaler.cc
@@ -1,13 +1,18 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "include/stringify.h"
+
 #include "journal/Journaler.h"
 #include "journal/Settings.h"
-#include "include/stringify.h"
-#include "gtest/gtest.h"
+
 #include "test/librados/test.h"
 #include "test/journal/RadosTestFixture.h"
-#include "include/stringify.h"
+
+#include "gtest/gtest.h"
+
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
 
 class TestJournaler : public RadosTestFixture {
 public: