diff options
| -rw-r--r-- | .github/workflows/build.yml | 3 | ||||
| -rw-r--r-- | source/core/StarLexicalCast.hpp | 4 | ||||
| -rw-r--r-- | source/core/StarNetElementFloatFields.hpp | 2 | ||||
| -rw-r--r-- | source/game/StarNetPackets.cpp | 10 |
4 files changed, 11 insertions, 8 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8434c80..8d8ce21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,6 +90,9 @@ jobs: build_linux: name: Build OpenStarbound Linux x86_64 runs-on: ubuntu-20.04 + env: + CC: clang + CXX: clang++ steps: - name: Install Packages diff --git a/source/core/StarLexicalCast.hpp b/source/core/StarLexicalCast.hpp index 15afe3f..08dab14 100644 --- a/source/core/StarLexicalCast.hpp +++ b/source/core/StarLexicalCast.hpp @@ -24,12 +24,12 @@ bool tryLexicalCast(bool& result, const char* first, const char* last); template <typename Type> bool tryLexicalCast(Type& result, String const& s) { - return tryLexicalCast<Type>(s.utf8Ptr(), s.utf8Ptr() + s.utf8Size()); + return tryLexicalCast<Type>(result, s.utf8Ptr(), s.utf8Ptr() + s.utf8Size()); } template <typename Type> bool tryLexicalCast(Type& result, StringView s) { - return tryLexicalCast<Type>(s.utf8Ptr(), s.utf8Ptr() + s.utf8Size()); + return tryLexicalCast<Type>(result, s.utf8Ptr(), s.utf8Ptr() + s.utf8Size()); } template <typename Type> diff --git a/source/core/StarNetElementFloatFields.hpp b/source/core/StarNetElementFloatFields.hpp index 6c8fbcf..b8ec28f 100644 --- a/source/core/StarNetElementFloatFields.hpp +++ b/source/core/StarNetElementFloatFields.hpp @@ -165,7 +165,7 @@ bool NetElementFloating<T>::writeNetDelta(DataStream& ds, uint64_t fromVersion, } template <typename T> -void NetElementFloating<T>::readNetDelta(DataStream& ds, float interpolationTime, NetCompatibilityRules rules) { +void NetElementFloating<T>::readNetDelta(DataStream& ds, float interpolationTime, NetCompatibilityRules _rules) { T t = readValue(ds); m_latestUpdateVersion = m_netVersion ? m_netVersion->current() : 0; diff --git a/source/game/StarNetPackets.cpp b/source/game/StarNetPackets.cpp index 44d1e21..e53f988 100644 --- a/source/game/StarNetPackets.cpp +++ b/source/game/StarNetPackets.cpp @@ -85,11 +85,11 @@ EnumMap<NetCompressionMode> const NetCompressionModeNames { Packet::~Packet() {} -void Packet::read(DataStream& ds, NetCompatibilityRules netRules) { read(ds); } -void Packet::read(DataStream& ds) {} -void Packet::write(DataStream& ds, NetCompatibilityRules netRules) const { write(ds); } -void Packet::write(DataStream& ds) const {} -void Packet::readJson(Json const& json) {} +void Packet::read(DataStream& ds, NetCompatibilityRules _netRules) { read(ds); } +void Packet::read(DataStream& _ds) {} +void Packet::write(DataStream& ds, NetCompatibilityRules _netRules) const { write(ds); } +void Packet::write(DataStream& _ds) const {} +void Packet::readJson(Json const& _json) {} Json Packet::writeJson() const { return JsonObject{}; } PacketCompressionMode Packet::compressionMode() const { return m_compressionMode; } |