sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another lot of warnings from Clang

Browse Source 
Closes #90
Closes #91
Closes #92
Closes #93
This commit is contained in:
Lynix
2016-10-17 16:01:05 +02:00
parent 7e594a861f
commit 4c6f049e0d
26 changed files with 87 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Engine/Audio/AlgorithmAudio.cpp
View File

@@ -7,13 +7,13 @@ TEST_CASE("MixToMono", "[AUDIO][ALGORITHM]")
{
SECTION("Mix two channels together")
{
std::array<int, 4> input{ 1, 3, 5, 3 };
std::array<int, 2> output{ 0, 0 };
std::array<int, 4> input = { { 1, 3, 5, 3 } };
std::array<int, 2> output = { { 0, 0 } };
// Two channels and two frames !
Nz::MixToMono(input.data(), output.data(), 2, 2);
std::array<int, 2> theoric{ 2, 4 }; // It's the mean of the two channels
REQUIRE(output == theoric);
std::array<int, 2> theoric = { { 2, 4 } }; // It's the mean of the two channels
CHECK(output == theoric);
}
}

4
tests/Engine/Core/AbstractHash.cpp
View File

@@ -14,13 +14,13 @@ SCENARIO("AbstractHash", "[CORE][ABSTRACTHASH]")
WHEN("We introduce data")
{
std::array<Nz::UInt8, 4> array{ 0, 1, 2, 3 };
std::array<Nz::UInt8, 4> array{ { 0, 1, 2, 3 } };
SHA512->Append(array.data(), array.size());
THEN("We ask for the bytearray")
{
Nz::ByteArray byteArray = SHA512->End();
REQUIRE(byteArray.GetSize() == SHA512->GetDigestLength());
CHECK(byteArray.GetSize() == SHA512->GetDigestLength());
}
}
}

22
tests/Engine/Core/Bitset.cpp
View File

@@ -11,8 +11,8 @@ SCENARIO("Bitset", "[CORE][BITSET]")
THEN("Capacity is 3 and size is 3")
{
REQUIRE(bitset.GetSize() == 3);
REQUIRE(bitset.GetCapacity() >= 3);
CHECK(bitset.GetSize() == 3);
CHECK(bitset.GetCapacity() >= 3);
}
}
@@ -25,11 +25,11 @@ SCENARIO("Bitset", "[CORE][BITSET]")
WHEN("We assign 'anotherData'")
{
defaultByte = anotherDataString;
REQUIRE(anotherData == defaultByte);
REQUIRE(defaultByte.GetSize() == 4);
REQUIRE(defaultByte.GetCapacity() >= 4);
REQUIRE(anotherData.GetSize() == 4);
REQUIRE(anotherData.GetCapacity() >= 4);
CHECK(anotherData == defaultByte);
CHECK(defaultByte.GetSize() == 4);
CHECK(defaultByte.GetCapacity() >= 4);
CHECK(anotherData.GetSize() == 4);
CHECK(anotherData.GetCapacity() >= 4);
}
}
@@ -43,17 +43,17 @@ SCENARIO("Bitset", "[CORE][BITSET]")
THEN("We get a copy")
{
REQUIRE(copyBitset == originalArray);
CHECK(copyBitset == originalArray);
AND_WHEN("We modify one")
{
for (auto i = 0; i < copyBitset.GetSize(); ++i)
for (std::size_t i = 0; i < copyBitset.GetSize(); ++i)
copyBitset[i] = false;
THEN("They are no more equal")
{
REQUIRE(copyBitset != originalArray);
REQUIRE(copyBitset == Nz::Bitset<>(3, false));
CHECK(copyBitset != originalArray);
CHECK(copyBitset == Nz::Bitset<>(3, false));
}
}
}

22
tests/Engine/Core/SparsePtr.cpp
View File

@@ -7,40 +7,40 @@ SCENARIO("SparsePtr", "[CORE][SPARSEPTR]")
{
GIVEN("A sparse pointer pointing to an array with a stride of 2")
{
std::array<int, 5> arrays{0, 1, 2, 3, 4};
std::array<int, 5> arrays = { {0, 1, 2, 3, 4} };
Nz::SparsePtr<int> sparsePtr(arrays.data(), 2 * sizeof(int));
WHEN("We use operators")
{
THEN("Operator[] with 2 should be 4")
{
REQUIRE(4 == sparsePtr[2]);
CHECK(4 == sparsePtr[2]);
}
THEN("Operator++ and Operator-- should be opposite")
{
++sparsePtr;
REQUIRE(2 == *sparsePtr);
CHECK(2 == *sparsePtr);
auto old = sparsePtr++;
REQUIRE(2 == *old);
REQUIRE(4 == *sparsePtr);
CHECK(2 == *old);
CHECK(4 == *sparsePtr);
--sparsePtr;
REQUIRE(2 == *sparsePtr);
CHECK(2 == *sparsePtr);
auto oldMinus = sparsePtr--;
REQUIRE(2 == *oldMinus);
REQUIRE(0 == *sparsePtr);
CHECK(2 == *oldMinus);
CHECK(0 == *sparsePtr);
}
THEN("Operator+ and operator-")
{
auto offsetTwo = sparsePtr + 2;
REQUIRE(4 == *offsetTwo);
CHECK(4 == *offsetTwo);
auto offsetZero = offsetTwo - 2;
REQUIRE(0 == *offsetZero);
CHECK(0 == *offsetZero);
REQUIRE((offsetTwo - offsetZero) == 2);
CHECK((offsetTwo - offsetZero) == 2);
}
}
}

6
tests/Engine/Graphics/ParticleGroup.cpp
View File

@@ -32,13 +32,13 @@ class TestParticleEmitter : public Nz::ParticleEmitter
public:
~TestParticleEmitter() override = default;
void Emit(Nz::ParticleGroup& system, float elapsedTime) const override
void Emit(Nz::ParticleGroup& system, float /*elapsedTime*/) const override
{
system.GenerateParticles(GetEmissionCount());
}
private:
void SetupParticles(Nz::ParticleMapper& mapper, unsigned int count) const override
void SetupParticles(Nz::ParticleMapper& /*mapper*/, unsigned int /*count*/) const override
{
}
};
@@ -49,7 +49,7 @@ class TestParticleGenerator : public Nz::ParticleGenerator
~TestParticleGenerator() override = default;
// Be aware that the interval is [startId, endId] and NOT [startId, endId)
void Generate(Nz::ParticleGroup& system, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId) override
void Generate(Nz::ParticleGroup& /*system*/, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId) override
{
Nz::SparsePtr<Nz::Vector3f> positionPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Position);
Nz::SparsePtr<Nz::Vector3f> velocityPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Velocity);