update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / utilities / util_merge_operators_test.cc

diff --git a/ceph/src/rocksdb/utilities/util_merge_operators_test.cc b/ceph/src/rocksdb/utilities/util_merge_operators_test.cc
index d8b3cfba69c9ba020ed1cad9cfc6a8322c6e8233..3b043ea2fb293af3ba0d06a6c891e76d70b08748 100644 (file)
--- a/ceph/src/rocksdb/utilities/util_merge_operators_test.cc
+++ b/ceph/src/rocksdb/utilities/util_merge_operators_test.cc
@@ -3,11 +3,11 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class UtilMergeOperatorTest : public testing::Test {
  public:
@@ -91,7 +91,7 @@ TEST_F(UtilMergeOperatorTest, MaxMergeOperator) {
   EXPECT_EQ("a", PartialMerge("a", ""));
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);