1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00

- Fix warning generated by recent snapshot of Clang 3.7.0, including:

- Pessimizing std::move() invocations in a number of places.

PR:		203154
Submitted by:	dim
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2015-09-28 14:24:08 +00:00
parent 0b4ef34bf8
commit d511179e3a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=398116
4 changed files with 82 additions and 0 deletions

View File

@ -0,0 +1,21 @@
--- 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()));
}

View File

@ -0,0 +1,13 @@
--- 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;

View File

@ -0,0 +1,28 @@
--- 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();

View File

@ -0,0 +1,20 @@
--- 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 {