diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:47:10 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-20 09:47:10 +1100 |
| commit | 1c89042016c739815b2d70bcbef4673eef6b63e0 (patch) | |
| tree | f7c8e96e744222857c613e5fd14720d2695613c3 /source/core/StarNetElementDynamicGroup.hpp | |
| parent | 30e1871d3f44629e00a1f66d8164e3e62c7f889f (diff) | |
| parent | 7c4fbad2ba7d79580a9ebbf9fde1de117be4d08e (diff) | |
Merge pull request #19 from kblaschke/fix-compiler-warnings
Fixed a huge amount of Clang warnings
Diffstat (limited to 'source/core/StarNetElementDynamicGroup.hpp')
| -rw-r--r-- | source/core/StarNetElementDynamicGroup.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/core/StarNetElementDynamicGroup.hpp b/source/core/StarNetElementDynamicGroup.hpp index 5d34c8d..75d11c8 100644 --- a/source/core/StarNetElementDynamicGroup.hpp +++ b/source/core/StarNetElementDynamicGroup.hpp @@ -91,7 +91,7 @@ auto NetElementDynamicGroup<Element>::addNetElement(ElementPtr element) -> Eleme readyElement(element); DataStreamBuffer storeBuffer; element->netStore(storeBuffer); - auto id = m_idMap.add(move(element)); + auto id = m_idMap.add(std::move(element)); addChangeData(ElementAddition(id, storeBuffer.takeData())); @@ -192,7 +192,7 @@ void NetElementDynamicGroup<Element>::netLoad(DataStream& ds) { element->netLoad(storeBuffer); readyElement(element); - m_idMap.add(id, move(element)); + m_idMap.add(id, std::move(element)); addChangeData(ElementAddition(id, storeBuffer.takeData())); } } @@ -256,10 +256,10 @@ void NetElementDynamicGroup<Element>::readNetDelta(DataStream& ds, float interpo m_idMap.clear(); } else if (auto addition = changeUpdate.template ptr<ElementAddition>()) { ElementPtr element = make_shared<Element>(); - DataStreamBuffer storeBuffer(move(get<1>(*addition))); + DataStreamBuffer storeBuffer(std::move(get<1>(*addition))); element->netLoad(storeBuffer); readyElement(element); - m_idMap.add(get<0>(*addition), move(element)); + m_idMap.add(get<0>(*addition), std::move(element)); } else if (auto removal = changeUpdate.template ptr<ElementRemoval>()) { m_idMap.remove(*removal); } @@ -296,7 +296,7 @@ void NetElementDynamicGroup<Element>::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>((int64_t)currentVersion - MaxChangeDataVersions, 0); while (!m_changeData.empty() && m_changeData.first().first < m_changeDataLastVersion) |