import 14.2.4 nautilus point release

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

diff --git a/ceph/src/rocksdb/utilities/env_librados_test.cc b/ceph/src/rocksdb/utilities/env_librados_test.cc
index 7d9b252ea418952ef28d2ee0a08bbafd026603b0..fb10224e7d79003e99e5a56a3575fcb1cb7e393d 100644 (file)
--- a/ceph/src/rocksdb/utilities/env_librados_test.cc
+++ b/ceph/src/rocksdb/utilities/env_librados_test.cc
@@ -108,7 +108,7 @@ public:
 
 TEST_F(EnvLibradosTest, Basics) {
   uint64_t file_size;
-  unique_ptr<WritableFile> writable_file;
+  std::unique_ptr<WritableFile> writable_file;
   std::vector<std::string> children;
 
   ASSERT_OK(env_->CreateDir("/dir"));
@@ -150,8 +150,8 @@ TEST_F(EnvLibradosTest, Basics) {
   ASSERT_EQ(3U, file_size);
 
   // Check that opening non-existent file fails.
-  unique_ptr<SequentialFile> seq_file;
-  unique_ptr<RandomAccessFile> rand_file;
+  std::unique_ptr<SequentialFile> seq_file;
+  std::unique_ptr<RandomAccessFile> rand_file;
   ASSERT_TRUE(
     !env_->NewSequentialFile("/dir/non_existent", &seq_file, soptions_).ok());
   ASSERT_TRUE(!seq_file);
@@ -169,9 +169,9 @@ TEST_F(EnvLibradosTest, Basics) {
 }
 
 TEST_F(EnvLibradosTest, ReadWrite) {
-  unique_ptr<WritableFile> writable_file;
-  unique_ptr<SequentialFile> seq_file;
-  unique_ptr<RandomAccessFile> rand_file;
+  std::unique_ptr<WritableFile> writable_file;
+  std::unique_ptr<SequentialFile> seq_file;
+  std::unique_ptr<RandomAccessFile> rand_file;
   Slice result;
   char scratch[100];
 
@@ -210,7 +210,7 @@ TEST_F(EnvLibradosTest, ReadWrite) {
 
 TEST_F(EnvLibradosTest, Locks) {
   FileLock* lock = nullptr;
-  unique_ptr<WritableFile> writable_file;
+  std::unique_ptr<WritableFile> writable_file;
 
   ASSERT_OK(env_->CreateDir("/dir"));
 
@@ -229,7 +229,7 @@ TEST_F(EnvLibradosTest, Misc) {
   ASSERT_OK(env_->GetTestDirectory(&test_dir));
   ASSERT_TRUE(!test_dir.empty());
 
-  unique_ptr<WritableFile> writable_file;
+  std::unique_ptr<WritableFile> writable_file;
   ASSERT_TRUE(!env_->NewWritableFile("/a/b", &writable_file, soptions_).ok());
 
   ASSERT_OK(env_->NewWritableFile("/a", &writable_file, soptions_));
@@ -249,14 +249,14 @@ TEST_F(EnvLibradosTest, LargeWrite) {
     write_data.append(1, 'h');
   }
 
-  unique_ptr<WritableFile> writable_file;
+  std::unique_ptr<WritableFile> writable_file;
   ASSERT_OK(env_->CreateDir("/dir"));
   ASSERT_OK(env_->NewWritableFile("/dir/g", &writable_file, soptions_));
   ASSERT_OK(writable_file->Append("foo"));
   ASSERT_OK(writable_file->Append(write_data));
   writable_file.reset();
 
-  unique_ptr<SequentialFile> seq_file;
+  std::unique_ptr<SequentialFile> seq_file;
   Slice result;
   ASSERT_OK(env_->NewSequentialFile("/dir/g", &seq_file, soptions_));
   ASSERT_OK(seq_file->Read(3, &result, scratch));  // Read "foo".
@@ -282,7 +282,7 @@ TEST_F(EnvLibradosTest, FrequentlySmallWrite) {
     write_data.append(1, 'h');
   }
 
-  unique_ptr<WritableFile> writable_file;
+  std::unique_ptr<WritableFile> writable_file;
   ASSERT_OK(env_->CreateDir("/dir"));
   ASSERT_OK(env_->NewWritableFile("/dir/g", &writable_file, soptions_));
   ASSERT_OK(writable_file->Append("foo"));
@@ -292,7 +292,7 @@ TEST_F(EnvLibradosTest, FrequentlySmallWrite) {
   }
   writable_file.reset();
 
-  unique_ptr<SequentialFile> seq_file;
+  std::unique_ptr<SequentialFile> seq_file;
   Slice result;
   ASSERT_OK(env_->NewSequentialFile("/dir/g", &seq_file, soptions_));
   ASSERT_OK(seq_file->Read(3, &result, scratch));  // Read "foo".
@@ -317,7 +317,7 @@ TEST_F(EnvLibradosTest, Truncate) {
     write_data.append(1, 'h');
   }
 
-  unique_ptr<WritableFile> writable_file;
+  std::unique_ptr<WritableFile> writable_file;
   ASSERT_OK(env_->CreateDir("/dir"));
   ASSERT_OK(env_->NewWritableFile("/dir/g", &writable_file, soptions_));
   ASSERT_OK(writable_file->Append(write_data));
@@ -801,7 +801,7 @@ public:
 
 TEST_F(EnvLibradosMutipoolTest, Basics) {
   uint64_t file_size;
-  unique_ptr<WritableFile> writable_file;
+  std::unique_ptr<WritableFile> writable_file;
   std::vector<std::string> children;
   std::vector<std::string> v = {"/tmp/dir1", "/tmp/dir2", "/tmp/dir3", "/tmp/dir4", "dir"};
 
@@ -850,8 +850,8 @@ TEST_F(EnvLibradosMutipoolTest, Basics) {
     ASSERT_EQ(3U, file_size);
 
     // Check that opening non-existent file fails.
-    unique_ptr<SequentialFile> seq_file;
-    unique_ptr<RandomAccessFile> rand_file;
+    std::unique_ptr<SequentialFile> seq_file;
+    std::unique_ptr<RandomAccessFile> rand_file;
     ASSERT_TRUE(
       !env_->NewSequentialFile(dir_non_existent.c_str(), &seq_file, soptions_).ok());
     ASSERT_TRUE(!seq_file);