update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / util / heap_test.cc

diff --git a/ceph/src/rocksdb/util/heap_test.cc b/ceph/src/rocksdb/util/heap_test.cc
index f2b902df004850d876710c02e149418e7f079a05..d036a62ebc10e701e1246c3e8c4b6b13544d0f5f 100644 (file)
--- a/ceph/src/rocksdb/util/heap_test.cc
+++ b/ceph/src/rocksdb/util/heap_test.cc
@@ -1,7 +1,7 @@
 //  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
+//  This source code is licensed under both the GPLv2 (found in the
+//  COPYING file in the root directory) and Apache 2.0 License
+//  (found in the LICENSE.Apache file in the root directory).
 
 #include <gtest/gtest.h>
 
@@ -16,7 +16,7 @@
 #ifndef GFLAGS
 const int64_t FLAGS_iters = 100000;
 #else
-#include <gflags/gflags.h>
+#include "util/gflags_compat.h"
 DEFINE_int64(iters, 100000, "number of pseudo-random operations in each test");
 #endif  // GFLAGS
 
@@ -133,7 +133,7 @@ INSTANTIATE_TEST_CASE_P(
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
 #ifdef GFLAGS
-  GFLAGS::ParseCommandLineFlags(&argc, &argv, true);
+  GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
 #endif  // GFLAGS
   return RUN_ALL_TESTS();
 }