update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / utilities / redis / redis_lists_test.cc

diff --git a/ceph/src/rocksdb/utilities/redis/redis_lists_test.cc b/ceph/src/rocksdb/utilities/redis/redis_lists_test.cc
index 57fb8f140830db85c5cc63f64e544b4e59db6bf0..961d87de7a12433a0bf6387dc2ef1c85ae591b5e 100644 (file)
--- a/ceph/src/rocksdb/utilities/redis/redis_lists_test.cc
+++ b/ceph/src/rocksdb/utilities/redis/redis_lists_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).
 /**
  * A test harness for the Redis API built on rocksdb.
  *
@@ -39,7 +39,7 @@ class RedisListsTest : public testing::Test {
 };
 
 const std::string RedisListsTest::kDefaultDbName =
-    test::TmpDir() + "/redis_lists_test";
+    test::PerThreadDBPath("redis_lists_test");
 Options RedisListsTest::options = Options();
 
 // operator== and operator<< are defined below for vectors (lists)
@@ -747,7 +747,7 @@ namespace {
 void MakeUpper(std::string* const s) {
   int len = static_cast<int>(s->length());
   for (int i = 0; i < len; ++i) {
-    (*s)[i] = toupper((*s)[i]);  // C-version defined in <ctype.h>
+    (*s)[i] = static_cast<char>(toupper((*s)[i]));  // C-version defined in <ctype.h>
   }
 }
 
@@ -886,7 +886,7 @@ int main(int argc, char* argv[]) {
 #else
 #include <stdio.h>
 
-int main(int argc, char* argv[]) {
+int main(int /*argc*/, char** /*argv*/) {
   fprintf(stderr, "SKIPPED as redis is not supported in ROCKSDB_LITE\n");
   return 0;
 }