From 431a9c00a56cf4c603be1cf5f773b193621d8150 Mon Sep 17 00:00:00 2001 From: Kai Blaschke Date: Mon, 19 Feb 2024 16:55:19 +0100 Subject: Fixed a huge amount of Clang warnings On Linux and macOS, using Clang to compile OpenStarbound produces about 400 MB worth of warnings during the build, making the compiler output unreadable and slowing the build down considerably. 99% of the warnings were unqualified uses of std::move and std::forward, which are now all properly qualified. Fixed a few other minor warnings about non-virtual destructors and some uses of std::move preventing copy elision on temporary objects. Most remaining warnings are now unused parameters. --- source/core/StarNetElementContainers.hpp | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'source/core/StarNetElementContainers.hpp') diff --git a/source/core/StarNetElementContainers.hpp b/source/core/StarNetElementContainers.hpp index 2127076..b48755d 100644 --- a/source/core/StarNetElementContainers.hpp +++ b/source/core/StarNetElementContainers.hpp @@ -124,7 +124,7 @@ void NetElementMapWrapper::initNetVersion(NetElementVersion const* vers m_changeDataLastVersion = 0; for (auto& change : Star::take(m_pendingChangeData)) - applyChange(move(change.second)); + applyChange(std::move(change.second)); addChangeData(ClearChange()); for (auto const& p : *this) @@ -140,7 +140,7 @@ template void NetElementMapWrapper::disableNetInterpolation() { m_interpolationEnabled = false; for (auto& change : Star::take(m_pendingChangeData)) - applyChange(move(change.second)); + applyChange(std::move(change.second)); } template @@ -175,7 +175,7 @@ void NetElementMapWrapper::netLoad(DataStream& ds) { for (uint64_t i = 0; i < count; ++i) { auto change = readChange(ds); addChangeData(change); - applyChange(move(change)); + applyChange(std::move(change)); } m_updated = true; @@ -219,9 +219,9 @@ void NetElementMapWrapper::readNetDelta(DataStream& ds, float interpola addChangeData(change); if (m_interpolationEnabled && interpolationTime > 0.0f) - addPendingChangeData(move(change), interpolationTime); + addPendingChangeData(std::move(change), interpolationTime); else - applyChange(move(change)); + applyChange(std::move(change)); } else { throw IOException("Improper delta code received in NetElementMapWrapper::readNetDelta"); } @@ -252,7 +252,7 @@ template auto NetElementMapWrapper::insert(value_type v) -> pair { auto res = BaseMap::insert(v); if (res.second) { - addChangeData(SetChange{move(v.first), move(v.second)}); + addChangeData(SetChange{std::move(v.first), std::move(v.second)}); m_updated = true; } return res; @@ -260,12 +260,12 @@ auto NetElementMapWrapper::insert(value_type v) -> pair auto NetElementMapWrapper::insert(key_type k, mapped_type v) -> pair { - return insert(value_type(move(k), move(v))); + return insert(value_type(std::move(k), std::move(v))); } template void NetElementMapWrapper::add(key_type k, mapped_type v) { - if (!insert(value_type(move(k), move(v))).second) + if (!insert(value_type(std::move(k), std::move(v))).second) throw MapException::format("Entry with key '{}' already present.", outputAny(k)); } @@ -274,13 +274,13 @@ void NetElementMapWrapper::set(key_type k, mapped_type v) { auto i = BaseMap::find(k); if (i != BaseMap::end()) { if (!(i->second == v)) { - addChangeData(SetChange{move(k), v}); - i->second = move(v); + addChangeData(SetChange{std::move(k), v}); + i->second = std::move(v); m_updated = true; } } else { addChangeData(SetChange{k, v}); - BaseMap::insert(value_type(move(k), move(v))); + BaseMap::insert(value_type(std::move(k), std::move(v))); m_updated = true; } } @@ -289,11 +289,11 @@ template void NetElementMapWrapper::push(key_type k, mapped_type v) { auto i = BaseMap::find(k); if (i != BaseMap::end()) { - addChangeData(SetChange(move(k), v)); - i->second = move(v); + addChangeData(SetChange(std::move(k), v)); + i->second = std::move(v); } else { addChangeData(SetChange(k, v)); - BaseMap::insert(value_type(move(k), move(v))); + BaseMap::insert(value_type(std::move(k), std::move(v))); } m_updated = true; } @@ -322,7 +322,7 @@ auto NetElementMapWrapper::take(key_type const& k) -> mapped_type { auto i = BaseMap::find(k); if (i == BaseMap::end()) throw MapException::format("Key '{}' not found in Map::take()", outputAny(k)); - auto m = move(i->second); + auto m = std::move(i->second); erase(i); return m; } @@ -332,9 +332,9 @@ auto NetElementMapWrapper::maybeTake(key_type const& k) -> Maybesecond); + auto m = std::move(i->second); erase(i); - return Maybe(move(m)); + return Maybe(std::move(m)); } template @@ -368,7 +368,7 @@ void NetElementMapWrapper::reset(BaseMap values) { } } - BaseMap::operator=(move(values)); + BaseMap::operator=(std::move(values)); } template @@ -420,7 +420,7 @@ void NetElementMapWrapper::addChangeData(ElementChange change) { uint64_t currentVersion = m_netVersion ? m_netVersion->current() : 0; starAssert(m_changeData.empty() || m_changeData.last().first <= currentVersion); - m_changeData.append({currentVersion, move(change)}); + m_changeData.append({currentVersion, std::move(change)}); m_changeDataLastVersion = max((int64_t)currentVersion - MaxChangeDataVersions, 0); while (!m_changeData.empty() && m_changeData.first().first < m_changeDataLastVersion) @@ -431,17 +431,17 @@ template void NetElementMapWrapper::addPendingChangeData(ElementChange change, float interpolationTime) { if (!m_pendingChangeData.empty() && interpolationTime < m_pendingChangeData.last().first) { for (auto& change : Star::take(m_pendingChangeData)) - applyChange(move(change.second)); + applyChange(std::move(change.second)); } - m_pendingChangeData.append({interpolationTime, move(change)}); + m_pendingChangeData.append({interpolationTime, std::move(change)}); } template void NetElementMapWrapper::applyChange(ElementChange change) { if (auto set = change.template ptr()) - BaseMap::set(move(set->key), move(set->value)); + BaseMap::set(std::move(set->key), std::move(set->value)); else if (auto remove = change.template ptr()) - BaseMap::remove(move(remove->key)); + BaseMap::remove(std::move(remove->key)); else BaseMap::clear(); m_updated = true; -- cgit v1.2.3