diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
| commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
| tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/core/StarNetElementBasicFields.hpp | |
| parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
| parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) | |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/core/StarNetElementBasicFields.hpp')
| -rw-r--r-- | source/core/StarNetElementBasicFields.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/core/StarNetElementBasicFields.hpp b/source/core/StarNetElementBasicFields.hpp index f0939a7..2d9f8e5 100644 --- a/source/core/StarNetElementBasicFields.hpp +++ b/source/core/StarNetElementBasicFields.hpp @@ -155,7 +155,7 @@ void NetElementBasicField<T>::set(T const& value) { template <typename T> void NetElementBasicField<T>::push(T value) { - m_value = move(value); + m_value = std::move(value); updated(); m_latestUpdateVersion = m_netVersion ? m_netVersion->current() : 0; if (m_pendingInterpolatedValues) @@ -251,14 +251,14 @@ void NetElementBasicField<T>::readNetDelta(DataStream& ds, float interpolationTi // case, this is an error or the step tracking is wildly off, so just clear // any other incoming values. if (interpolationTime > 0.0f && (m_pendingInterpolatedValues->empty() || interpolationTime >= m_pendingInterpolatedValues->last().first)) { - m_pendingInterpolatedValues->append({interpolationTime, move(t)}); + m_pendingInterpolatedValues->append({interpolationTime, std::move(t)}); } else { - m_value = move(t); + m_value = std::move(t); m_pendingInterpolatedValues->clear(); updated(); } } else { - m_value = move(t); + m_value = std::move(t); updated(); } } @@ -314,7 +314,7 @@ NetElementData<T>::NetElementData() template <typename T> NetElementData<T>::NetElementData(function<void(DataStream&, T&)> reader, function<void(DataStream&, T const&)> writer) - : m_reader(move(reader)), m_writer(move(writer)) {} + : m_reader(std::move(reader)), m_writer(std::move(writer)) {} template <typename T> void NetElementData<T>::readData(DataStream& ds, T& v) const { |