update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / utilities / memory / memory_test.cc

diff --git a/ceph/src/rocksdb/utilities/memory/memory_test.cc b/ceph/src/rocksdb/utilities/memory/memory_test.cc
index 69202521a12e92dbbace3bd39ad444bf14551705..8d976ef9214c3b6bbea10494447b9263a639cd4c 100644 (file)
--- a/ceph/src/rocksdb/utilities/memory/memory_test.cc
+++ b/ceph/src/rocksdb/utilities/memory/memory_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).
 
 #ifndef ROCKSDB_LITE
 
@@ -19,7 +19,7 @@ namespace rocksdb {
 
 class MemoryTest : public testing::Test {
  public:
-  MemoryTest() : kDbDir(test::TmpDir() + "/memory_test"), rnd_(301) {
+  MemoryTest() : kDbDir(test::PerThreadDBPath("memory_test")), rnd_(301) {
     assert(Env::Default()->CreateDirIfMissing(kDbDir).ok());
   }
 
@@ -269,7 +269,7 @@ int main(int argc, char** argv) {
 #else
 #include <cstdio>
 
-int main(int argc, char** argv) {
+int main(int /*argc*/, char** /*argv*/) {
   printf("Skipped in RocksDBLite as utilities are not supported.\n");
   return 0;
 }