octoleo
/
s3fs-fuse
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace uses of emplace with operator=(&&) (#2287) 

emplace does not overwrite the value if the key already exists.  C++17 has
insert_or_assign but C++11 only has operator= which invokes the default
constructor.  Follows on to 6781ef5bd1.
This commit is contained in:
Andrew Gaul 2023-08-22 23:12:12 +09:00 committed by GitHub
parent 218adcb29b
commit a568aa70fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cache.cpp
View File

@ -389,10 +389,10 @@ bool StatCache::AddStat(const std::string& key, const headers_t& meta, bool forc
// add
AutoLock lock(&StatCache::stat_cache_lock);
std::pair<stat_cache_t::iterator, bool> pair = stat_cache.emplace(key, std::move(ent));
const auto& value = stat_cache[key] = std::move(ent);
// check symbolic link cache
if(!S_ISLNK(pair.first->second.stbuf.st_mode)){
if(!S_ISLNK(value.stbuf.st_mode)){
if(symlink_cache.end() != symlink_cache.find(key)){
// if symbolic link cache has key, thus remove it.
DelSymlink(key.c_str(), AutoLock::ALREADY_LOCKED);
@ -491,7 +491,7 @@ bool StatCache::AddNoObjectCache(const std::string& key)
// add
AutoLock lock(&StatCache::stat_cache_lock);
stat_cache.emplace(key, std::move(ent));
stat_cache[key] = std::move(ent);
// check symbolic link cache
if(symlink_cache.end() != symlink_cache.find(key)){
@ -677,7 +677,7 @@ bool StatCache::AddSymlink(const std::string& key, const std::string& value)
// add
AutoLock lock(&StatCache::stat_cache_lock);
symlink_cache.emplace(key, std::move(ent));
symlink_cache[key] = std::move(ent);
return true;
}