From 21680171a2c3849f5b6dbe817906052d1ad69ec1 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Fri, 8 Sep 2023 09:13:04 +0200 Subject: [PATCH] Replace GetPlatformEndianness() by PlatformEndianness constexpr from nazarautils --- include/Nazara/Core/Algorithm.inl | 4 ++-- src/Nazara/Audio/Formats/libvorbisLoader.cpp | 2 +- tests/UnitTests/Engine/Core/ByteStreamTest.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Core/Algorithm.inl b/include/Nazara/Core/Algorithm.inl index 6778709f5..9aa742a55 100644 --- a/include/Nazara/Core/Algorithm.inl +++ b/include/Nazara/Core/Algorithm.inl @@ -128,7 +128,7 @@ namespace Nz // Flush bits in case a writing is in progress context.FlushBits(); - if (context.endianness != Endianness::Unknown && context.endianness != GetPlatformEndianness()) + if (context.endianness != Endianness::Unknown && context.endianness != PlatformEndianness) value = ByteSwap(value); return context.stream->Write(&value, sizeof(T)) == sizeof(T); @@ -207,7 +207,7 @@ namespace Nz if (context.stream->Read(value, sizeof(T)) == sizeof(T)) { - if (context.endianness != Endianness::Unknown && context.endianness != GetPlatformEndianness()) + if (context.endianness != Endianness::Unknown && context.endianness != PlatformEndianness) *value = ByteSwap(*value); return true; diff --git a/src/Nazara/Audio/Formats/libvorbisLoader.cpp b/src/Nazara/Audio/Formats/libvorbisLoader.cpp index b5bedb72c..537feceaf 100644 --- a/src/Nazara/Audio/Formats/libvorbisLoader.cpp +++ b/src/Nazara/Audio/Formats/libvorbisLoader.cpp @@ -91,7 +91,7 @@ namespace Nz UInt64 ReadOgg(OggVorbis_File* file, void* buffer, UInt64 sampleCount) { - constexpr int bigendian = (GetPlatformEndianness() == Endianness::LittleEndian) ? 0 : 1; + constexpr int bigendian = (PlatformEndianness == Endianness::LittleEndian) ? 0 : 1; char* ptr = reinterpret_cast(buffer); UInt64 remainingBytes = sampleCount * sizeof(Int16); diff --git a/tests/UnitTests/Engine/Core/ByteStreamTest.cpp b/tests/UnitTests/Engine/Core/ByteStreamTest.cpp index c441ed6e9..164f7dbec 100644 --- a/tests/UnitTests/Engine/Core/ByteStreamTest.cpp +++ b/tests/UnitTests/Engine/Core/ByteStreamTest.cpp @@ -45,7 +45,7 @@ SCENARIO("ByteStream", "[CORE][BYTESTREAM]") Nz::ByteArray byteArray(numberOfBytes); Nz::ByteStream byteStream(&byteArray); - byteStream.SetDataEndianness(Nz::GetPlatformEndianness() == Nz::Endianness::BigEndian ? Nz::Endianness::LittleEndian : Nz::Endianness::BigEndian); + byteStream.SetDataEndianness(Nz::PlatformEndianness == Nz::Endianness::BigEndian ? Nz::Endianness::LittleEndian : Nz::Endianness::BigEndian); WHEN("We write an integer") {