--- db/db_bench.cc.orig	2015-08-31 20:23:39.000000000 +0200

+++ db/db_bench.cc	2015-09-08 00:15:47.039650000 +0200

@@ -2259,8 +2259,7 @@ class Benchmark {

         fprintf(stderr, "Open flash device failed\n");

         exit(1);

       }

-      flashcache_aware_env_ =

-          std::move(NewFlashcacheAwareEnv(FLAGS_env, cachedev_fd_));

+      flashcache_aware_env_ = NewFlashcacheAwareEnv(FLAGS_env, cachedev_fd_);

       if (flashcache_aware_env_.get() == nullptr) {

         fprintf(stderr, "Failed to open flashcahce device at %s\n",

                 FLAGS_flashcache_dev.c_str());

@@ -2884,7 +2883,7 @@ class Benchmark {

     std::vector<std::unique_ptr<const char[]> > key_guards;

     std::vector<std::string> values(entries_per_batch_);

     while (static_cast<int64_t>(keys.size()) < entries_per_batch_) {

-      key_guards.push_back(std::move(std::unique_ptr<const char[]>()));

+      key_guards.push_back(std::unique_ptr<const char[]>());

       keys.push_back(AllocateKey(&key_guards.back()));

     }

--- db/wal_manager.cc.orig	2015-08-31 20:23:39.000000000 +0200

+++ db/wal_manager.cc	2015-09-07 23:52:03.849468000 +0200

@@ -329,8 +329,8 @@ Status WalManager::GetSortedWalsOfType(c

         return s;

       }

-      log_files.push_back(std::move(std::unique_ptr<LogFile>(

-          new LogFileImpl(number, log_type, sequence, size_bytes))));

+      log_files.push_back(std::unique_ptr<LogFile>(

+          new LogFileImpl(number, log_type, sequence, size_bytes)));

     }

   }

   CompareLogByPointer compare_log_files;

--- tools/db_stress.cc.orig	2015-08-31 20:23:39.000000000 +0200

+++ tools/db_stress.cc	2015-09-16 14:31:58.271646000 +0200

@@ -222,7 +222,7 @@ DEFINE_int32(set_options_one_in, 0,

 DEFINE_int32(set_in_place_one_in, 0,

              "With a chance of 1/N, toggle in place support option");

-DEFINE_int64(cache_size, 2 * KB * KB * KB,

+DEFINE_int64(cache_size, static_cast<int64_t>(2) * KB * KB * KB,

              "Number of bytes to use as a cache of uncompressed data.");

 static bool ValidateInt32Positive(const char* flagname, int32_t value) {

--- util/sst_dump_tool.cc.orig	2015-08-31 20:23:39.000000000 +0200

+++ util/sst_dump_tool.cc	2015-09-08 00:07:36.564981000 +0200

@@ -164,7 +164,7 @@ int SstFileReader::ShowAllCompressionSiz

   compress_type.insert(

       std::make_pair(CompressionType::kLZ4HCCompression, "kLZ4HCCompression"));

-  fprintf(stdout, "Block Size: %lu\n", block_size);

+  fprintf(stdout, "Block Size: %zu\n", block_size);

   for (CompressionType i = CompressionType::kNoCompression;

        i != CompressionType::kLZ4HCCompression; i = CompressionType(i + 1)) {

--- utilities/backupable/backupable_db.cc.orig	2015-08-31 20:23:39.000000000 +0200

+++ utilities/backupable/backupable_db.cc	2015-09-08 00:08:37.375425000 +0200

@@ -560,10 +560,10 @@ Status BackupEngineImpl::Initialize() {

       continue;

     }

     assert(backups_.find(backup_id) == backups_.end());

-    backups_.insert(std::move(

+    backups_.insert(

         std::make_pair(backup_id, unique_ptr<BackupMeta>(new BackupMeta(

                                       GetBackupMetaFile(backup_id),

-                                      &backuped_file_infos_, backup_env_)))));

+                                      &backuped_file_infos_, backup_env_))));

   }

   if (options_.destroy_old_data) {  // Destroy old data

@@ -701,10 +701,10 @@ Status BackupEngineImpl::CreateNewBackup

   BackupID new_backup_id = latest_backup_id_ + 1;

   assert(backups_.find(new_backup_id) == backups_.end());

-  auto ret = backups_.insert(std::move(

+  auto ret = backups_.insert(

       std::make_pair(new_backup_id, unique_ptr<BackupMeta>(new BackupMeta(

                                         GetBackupMetaFile(new_backup_id),

-                                        &backuped_file_infos_, backup_env_)))));

+                                        &backuped_file_infos_, backup_env_))));

   assert(ret.second == true);

   auto& new_backup = ret.first->second;

   new_backup->RecordTimestamp();

--- utilities/checkpoint/checkpoint.cc.orig	2015-08-31 20:23:39.000000000 +0200

+++ utilities/checkpoint/checkpoint.cc	2015-09-08 00:05:26.049545000 +0200

@@ -131,7 +131,7 @@ Status CheckpointImpl::CreateCheckpoint(

                    (type == kDescriptorFile) ? manifest_file_size : 0);

     }

   }

-  Log(db_->GetOptions().info_log, "Number of log files %ld",

+  Log(db_->GetOptions().info_log, "Number of log files %zu",

       live_wal_files.size());

   // Link WAL files. Copy exact size of last one because it is the only one

--- utilities/document/json_document.cc.orig	2015-08-31 20:23:39.000000000 +0200

+++ utilities/document/json_document.cc	2015-09-08 00:10:06.250157000 +0200

@@ -307,7 +307,7 @@ JSONDocument JSONDocument::operator[](co

   assert(foundValue != nullptr);

   // No need to save paths in const objects

   JSONDocument ans(foundValue, false);

-  return std::move(ans);

+  return ans;

 }

 size_t JSONDocument::Count() const {

@@ -330,7 +330,7 @@ JSONDocument JSONDocument::operator[](si

   auto arrayVal = reinterpret_cast<fbson::ArrayVal*>(value_);

   auto foundValue = arrayVal->get(static_cast<int>(i));

   JSONDocument ans(foundValue, false);

-  return std::move(ans);

+  return ans;

 }

 bool JSONDocument::IsNull() const {