Skip to content

Commit 3719680

Browse files
committed
· Warning review
· Updated externals
1 parent 69582fa commit 3719680

File tree

8 files changed

+60
-52
lines changed

8 files changed

+60
-52
lines changed

externals/scener-math

Submodule scener-math updated from 3170697 to 70033f0

source/samples/skeletal-animation/earthshaker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace skeletal::animation
6262
_model->update(time);
6363
}
6464

65-
void earthshaker::draw(const steptime& time) noexcept
65+
void earthshaker::draw([[maybe_unused]] const steptime& time) noexcept
6666
{
6767
const auto camera_component = std::dynamic_pointer_cast<camera>(_renderer->components()[0]);
6868

source/scener/graphics/drawable_component.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace scener::graphics
3232

3333
/// Called when the component should be drawn.
3434
/// \param time time passed since the last call to Draw.
35-
void draw(const steptime& time) noexcept override;
35+
void draw([[maybe_unused]] const steptime& time) noexcept override;
3636

3737
/// Gets a value indicating whether Draw should be called.
3838
/// \returns true if Draw should be called; false otherwise.

tests/io/binary_reader_test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ TEST_F(binary_reader_test, read_uint32)
9696

9797
reader.close();
9898

99-
EXPECT_NE(value, 0);
99+
EXPECT_NE(value, static_cast<std::uint32_t>(0));
100100
}
101101

102102
// Tests ReadInt64().
@@ -122,7 +122,7 @@ TEST_F(binary_reader_test, read_uint64)
122122

123123
reader.close();
124124

125-
EXPECT_NE(value, 0);
125+
EXPECT_NE(value, static_cast<std::uint64_t>(0));
126126
}
127127

128128
// Tests ReadSingle().

tests/io/file_stream_test.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ TEST_F(file_stream_test, begin_position)
2929
{
3030
file_stream stream(file_stream_test::TEST_FILE, std::ios::in | std::ios::binary);
3131

32-
EXPECT_EQ(0, stream.position());
32+
EXPECT_EQ(static_cast<std::size_t>(0), stream.position());
3333

3434
stream.close();
3535
}
@@ -123,7 +123,7 @@ TEST_F(file_stream_test, read_uint32)
123123
stream.read(reinterpret_cast<char*>(&value), 0, sizeof(std::uint32_t));
124124

125125
EXPECT_EQ(sizeof(std::uint32_t), stream.position());
126-
EXPECT_NE(value, 0);
126+
EXPECT_NE(value, static_cast<std::uint32_t>(0));
127127

128128
stream.close();
129129
}
@@ -137,7 +137,7 @@ TEST_F(file_stream_test, read_int64)
137137
stream.read(reinterpret_cast<char*>(&value), 0, sizeof(std::int64_t));
138138

139139
EXPECT_EQ(sizeof(std::int64_t), stream.position());
140-
EXPECT_NE(value, 0);
140+
EXPECT_NE(value, static_cast<std::int64_t>(0));
141141

142142
stream.close();
143143
}
@@ -151,7 +151,7 @@ TEST_F(file_stream_test, read_uint64)
151151
stream.read(reinterpret_cast<char*>(&value), 0, sizeof(std::uint64_t));
152152

153153
EXPECT_EQ(sizeof(std::uint64_t), stream.position());
154-
EXPECT_NE(value, 0);
154+
EXPECT_NE(value, static_cast<std::uint64_t>(0));
155155

156156
stream.close();
157157
}

tests/io/memory_stream_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ TEST_F(memory_stream_test, read)
3131

3232
stream.read(reinterpret_cast<char*>(out.data()), 0, 3);
3333

34-
EXPECT_EQ(3, out.size());
34+
EXPECT_EQ(3, static_cast<std::int32_t>(out.size()));
3535
EXPECT_EQ(1, out[0]);
3636
EXPECT_EQ(2, out[1]);
3737
EXPECT_EQ(3, out[2]);

tests/text/utf8_encoding_test.cpp

+49-41
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ TEST_F(utf8_encoding_test, get_byte_count_from_char_array)
2222
auto chars = std::vector<char16_t>(std::begin(tmp), std::end(tmp));
2323
auto count = encoding.get_byte_count(chars);
2424

25-
EXPECT_EQ(8, count);
25+
EXPECT_EQ(static_cast<std::size_t>(8), count);
2626
}
2727

2828
TEST_F(utf8_encoding_test, get_byte_count_from_char_array_range)
@@ -32,7 +32,7 @@ TEST_F(utf8_encoding_test, get_byte_count_from_char_array_range)
3232
auto chars = std::vector<char16_t>(std::begin(tmp), std::end(tmp));
3333
auto count = encoding.get_byte_count(chars, 2, 3);
3434

35-
EXPECT_EQ(6, count);
35+
EXPECT_EQ(static_cast<std::size_t>(6), count);
3636
}
3737

3838
TEST_F(utf8_encoding_test, get_bytes_from_char_array)
@@ -42,7 +42,8 @@ TEST_F(utf8_encoding_test, get_bytes_from_char_array)
4242
auto chars = std::vector<char16_t>(std::begin(tmp), std::end(tmp));
4343
auto bytes = encoding.get_bytes(chars);
4444

45-
EXPECT_EQ( 8, bytes.size());
45+
EXPECT_EQ(static_cast<std::size_t>(8), bytes.size());
46+
4647
EXPECT_EQ(0x7A, bytes[0]);
4748
EXPECT_EQ(0x61, bytes[1]);
4849
EXPECT_EQ(0xCC, bytes[2]);
@@ -63,8 +64,9 @@ TEST_F(utf8_encoding_test, get_bytes_from_char_array_range)
6364

6465
auto byte_count = encoding.get_bytes(chars, 2, 3, bytes, 0);
6566

66-
EXPECT_EQ( 6, byte_count);
67-
EXPECT_EQ( 6, bytes.size());
67+
EXPECT_EQ(static_cast<std::size_t>(6), byte_count);
68+
EXPECT_EQ(static_cast<std::size_t>(6), bytes.size());
69+
6870
EXPECT_EQ(0xCC, bytes[0]);
6971
EXPECT_EQ(0x86, bytes[1]);
7072
EXPECT_EQ(0xC7, bytes[2]);
@@ -79,7 +81,7 @@ TEST_F(utf8_encoding_test, get_byte_count_from_string)
7981
auto s = u"za\u0306\u01FD\u03B2";
8082
auto count = encoding.get_byte_count(s);
8183

82-
EXPECT_EQ(8, count);
84+
EXPECT_EQ(static_cast<std::size_t>(8), count);
8385
}
8486

8587
TEST_F(utf8_encoding_test, get_bytes_from_string)
@@ -88,7 +90,8 @@ TEST_F(utf8_encoding_test, get_bytes_from_string)
8890
auto s = u"za\u0306\u01FD\u03B2";
8991
auto bytes = encoding.get_bytes(s);
9092

91-
EXPECT_EQ( 8, bytes.size());
93+
EXPECT_EQ(static_cast<std::size_t>(8), bytes.size());
94+
9295
EXPECT_EQ(0x7A, bytes[0]);
9396
EXPECT_EQ(0x61, bytes[1]);
9497
EXPECT_EQ(0xCC, bytes[2]);
@@ -108,8 +111,9 @@ TEST_F(utf8_encoding_test, get_bytes_from_string_range)
108111
auto bytes = std::vector<std::uint8_t>(bcount, 0);
109112
auto byte_count = encoding.get_bytes(s, 2, 3, bytes, 0);
110113

111-
EXPECT_EQ( 6, bytes.size());
112-
EXPECT_EQ( 6, byte_count);
114+
EXPECT_EQ(static_cast<std::size_t>(6), bytes.size());
115+
EXPECT_EQ(static_cast<std::size_t>(6), byte_count);
116+
113117
EXPECT_EQ(0xCC, bytes[0]);
114118
EXPECT_EQ(0x86, bytes[1]);
115119
EXPECT_EQ(0xC7, bytes[2]);
@@ -124,7 +128,7 @@ TEST_F(utf8_encoding_test, get_byte_count_from_char_array_pointer)
124128
char16_t chars[] = { u'z', u'a', u'\u0306', u'\u01FD', u'\u03B2'};
125129
auto count = encoding.get_byte_count(&chars[0], 5);
126130

127-
EXPECT_EQ(8, count);
131+
EXPECT_EQ(static_cast<std::size_t>(8), count);
128132
}
129133

130134
TEST_F(utf8_encoding_test, get_bytes_from_char_array_pointer)
@@ -135,9 +139,10 @@ TEST_F(utf8_encoding_test, get_bytes_from_char_array_pointer)
135139
auto bytes = std::vector<std::uint8_t>(bcount, 0);
136140
auto byte_count = encoding.get_bytes(&chars[0], 5, bytes.data(), bcount);
137141

138-
EXPECT_EQ( 8, bcount);
139-
EXPECT_EQ( 8, byte_count);
140-
EXPECT_EQ( 8, bytes.size());
142+
EXPECT_EQ(static_cast<std::size_t>(8), bcount);
143+
EXPECT_EQ(static_cast<std::size_t>(8), byte_count);
144+
EXPECT_EQ(static_cast<std::size_t>(8), bytes.size());
145+
141146
EXPECT_EQ(0x7A, bytes[0]);
142147
EXPECT_EQ(0x61, bytes[1]);
143148
EXPECT_EQ(0xCC, bytes[2]);
@@ -155,8 +160,8 @@ TEST_F(utf8_encoding_test, get_char_count_from_byte_array)
155160
auto bytes = encoding.get_bytes(s);
156161
auto count = encoding.get_char_count(bytes);
157162

158-
EXPECT_EQ(5 , count);
159-
EXPECT_EQ(s.size(), count);
163+
EXPECT_EQ(static_cast<std::size_t>(5), count);
164+
EXPECT_EQ(s.size() , count);
160165
}
161166

162167
TEST_F(utf8_encoding_test, get_char_count_from_byte_array_pointer)
@@ -166,8 +171,8 @@ TEST_F(utf8_encoding_test, get_char_count_from_byte_array_pointer)
166171
auto bytes = encoding.get_bytes(s);
167172
auto count = encoding.get_char_count(&bytes[0], bytes.size());
168173

169-
EXPECT_EQ(5 , count);
170-
EXPECT_EQ(s.size(), count);
174+
EXPECT_EQ(static_cast<std::size_t>(5), count);
175+
EXPECT_EQ(s.size() , count);
171176
}
172177

173178
//---------------------------------------------------------------------------------------------------
@@ -184,7 +189,7 @@ TEST_F(utf8_encoding_test, get_byte_count_with_non_null_char)
184189

185190
auto byte_count = utf8.get_byte_count(chars, 1, 2);
186191

187-
EXPECT_EQ(3, byte_count);
192+
EXPECT_EQ(static_cast<std::size_t>(3), byte_count);
188193
}
189194

190195
// PosTest2: Verify method get_byte_count(std::vector<char16_t>,Int32,Int32) with null std::vector<char16_t>
@@ -195,7 +200,7 @@ TEST_F(utf8_encoding_test, get_byte_count_with_null_char)
195200

196201
auto byte_count = utf8.get_byte_count(chars, 0, 0);
197202

198-
EXPECT_EQ(0, byte_count);
203+
EXPECT_EQ(static_cast<std::size_t>(0), byte_count);
199204
}
200205

201206
// NegTest1: ArgumentNullException is not thrown when chars is a null reference
@@ -253,7 +258,7 @@ TEST_F(utf8_encoding_test, get_byte_count_with_empty_string)
253258

254259
auto byte_count = utf8.get_byte_count(chars);
255260

256-
EXPECT_EQ(0, byte_count);
261+
EXPECT_EQ(static_cast<std::size_t>(0), byte_count);
257262
}
258263

259264
//---------------------------------------------------------------------------------------------------
@@ -273,11 +278,12 @@ TEST_F(utf8_encoding_test, get_bytes_withnon_null_chars)
273278

274279
bytes.resize(byte_count, 0);
275280

276-
EXPECT_EQ(3, byte_count);
281+
EXPECT_EQ(static_cast<std::size_t>(3), byte_count);
277282

278283
auto bytes_encoded_count = utf8.get_bytes(chars, 1, 2, bytes, 0);
279284

280-
EXPECT_EQ( 3, bytes_encoded_count);
285+
EXPECT_EQ(static_cast<std::size_t>(3), bytes_encoded_count);
286+
281287
EXPECT_EQ( 37, bytes[0]);
282288
EXPECT_EQ(206, bytes[1]);
283289
EXPECT_EQ(160, bytes[2]);
@@ -296,7 +302,7 @@ TEST_F(utf8_encoding_test, get_bytes_with_null_chars)
296302

297303
auto bytes_encoded_count = utf8.get_bytes(chars, 0, 0, bytes, 0);
298304

299-
EXPECT_EQ(0, bytes_encoded_count);
305+
EXPECT_EQ(static_cast<std::size_t>(0), bytes_encoded_count);
300306
}
301307

302308
// NegTest1: ArgumentNullException is not thrown when chars is a null reference
@@ -364,7 +370,7 @@ TEST_F(utf8_encoding_test, get_bytes_with_non_null_string)
364370

365371
auto bytes_encoded_count = utf8.get_bytes(chars, 1, 2, bytes, 0);
366372

367-
EXPECT_EQ(2, bytes_encoded_count);
373+
EXPECT_EQ(static_cast<std::size_t>(2), bytes_encoded_count);
368374
}
369375

370376
// PosTest2: Verify method GetBytes(String,Int32,Int32,Byte[],Int32) with null chars
@@ -380,7 +386,7 @@ TEST_F(utf8_encoding_test, get_bytes_with_empty_string)
380386

381387
auto bytes_encoded_count = utf8.get_bytes(chars, 0, byte_count, bytes, 0);
382388

383-
EXPECT_EQ(0, bytes_encoded_count);
389+
EXPECT_EQ(static_cast<std::size_t>(0), bytes_encoded_count);
384390
}
385391

386392
// NegTest3: ArgumentOutOfRangeException is not thrown when charIndex is less than zero
@@ -513,7 +519,7 @@ TEST_F(utf8_encoding_test, get_char_count_with_non_null_buffer)
513519

514520
auto char_count = utf8.get_char_count(bytes, 2, 8);
515521

516-
ASSERT_TRUE(8 == char_count);
522+
EXPECT_EQ(static_cast<std::size_t>(8), char_count);
517523
}
518524

519525
// PosTest2: Verify method get_char_count with a empty buffer
@@ -522,9 +528,9 @@ TEST_F(utf8_encoding_test, get_char_count_with_empty_buffer)
522528
utf8_encoding utf8;
523529
std::vector<std::uint8_t> bytes = { };
524530

525-
int char_count = utf8.get_char_count(bytes, 0, 0);
531+
auto char_count = utf8.get_char_count(bytes, 0, 0);
526532

527-
EXPECT_EQ(0, char_count);
533+
EXPECT_EQ(static_cast<std::size_t>(0), char_count);
528534
}
529535

530536
// NegTest2: ArgumentOutOfRangeException is not thrown when index is less than zero
@@ -573,15 +579,16 @@ TEST_F(utf8_encoding_test, get_chars_with_non_null_chars)
573579
std::vector<std::uint8_t> bytes = { 35, 37, 206, 160, 206, 163 };
574580
std::vector<char16_t> chars;
575581

576-
int char_count = utf8.get_char_count(bytes, 2, 2);
582+
auto char_count = utf8.get_char_count(bytes, 2, 2);
577583

578-
EXPECT_TRUE(1 == char_count);
584+
EXPECT_EQ(static_cast<std::size_t>(1), char_count);
579585

580586
chars.resize(char_count);
581587

582-
int charsEncodedCount = utf8.get_chars(bytes, 2, 2, chars, 0);
588+
auto chars_encoded_count = utf8.get_chars(bytes, 2, 2, chars, 0);
589+
590+
EXPECT_EQ(static_cast<std::size_t>(1), chars_encoded_count);
583591

584-
EXPECT_EQ(1 , charsEncodedCount);
585592
EXPECT_EQ(u'\u03a0', chars[0]);
586593
}
587594

@@ -592,13 +599,13 @@ TEST_F(utf8_encoding_test, get_chars_with_empty_chars)
592599
std::vector<std::uint8_t> bytes = { 35, 37, 206, 160, 206, 163 };
593600
std::vector<char16_t> chars;
594601

595-
int char_count = utf8.get_char_count(bytes, 2, 2);
602+
auto char_count = utf8.get_char_count(bytes, 2, 2);
596603

597-
EXPECT_EQ(1, char_count);
604+
EXPECT_EQ(static_cast<std::size_t>(1), char_count);
598605

599-
int charsEncodedCount = utf8.get_chars(bytes, 0, 0, chars, 0);
606+
auto chars_encoded_count = utf8.get_chars(bytes, 0, 0, chars, 0);
600607

601-
EXPECT_EQ(0, charsEncodedCount);
608+
EXPECT_EQ(static_cast<std::size_t>(0), chars_encoded_count);
602609
}
603610

604611
// NegTest3: ArgumentOutOfRangeException is not thrown when byteIndex is less than zero
@@ -609,7 +616,7 @@ TEST_F(utf8_encoding_test, get_chars_when_byte_index_is_less_than_zero)
609616
std::vector<char16_t> chars;
610617
auto char_count = utf8.get_char_count(bytes, 2, 2);
611618

612-
EXPECT_EQ(1, char_count);
619+
EXPECT_EQ(static_cast<std::size_t>(1), char_count);
613620
EXPECT_ANY_THROW({ utf8.get_chars(bytes, -1, 2, chars, 0); });
614621
}
615622

@@ -621,7 +628,8 @@ TEST_F(utf8_encoding_test, get_chars_when_byte_count_is_less_than_zero)
621628
std::vector<char16_t> chars;
622629
auto char_count = utf8.get_char_count(bytes, 2, 2);
623630

624-
EXPECT_EQ(1, char_count);
631+
EXPECT_EQ(static_cast<std::size_t>(1), char_count);
632+
625633
EXPECT_ANY_THROW({ utf8.get_chars(bytes, 1, -2, chars, 0); });
626634
}
627635

@@ -633,7 +641,7 @@ TEST_F(utf8_encoding_test, get_chars_when_char_index_is_less_than_zero)
633641
std::vector<char16_t> chars;
634642
auto char_count = utf8.get_char_count(bytes, 2, 2);
635643

636-
EXPECT_EQ(1, char_count);
644+
EXPECT_EQ(static_cast<std::size_t>(1), char_count);
637645
EXPECT_ANY_THROW({ utf8.get_chars(bytes, 2, 2, chars, -1); });
638646
}
639647

@@ -645,7 +653,7 @@ TEST_F(utf8_encoding_test, get_chars_with_invalid_range_in_chars)
645653
std::vector<char16_t> chars;
646654
auto char_count = utf8.get_char_count(bytes, 2, 2);
647655

648-
EXPECT_EQ(1, char_count);
656+
EXPECT_EQ(static_cast<std::size_t>(1), char_count);
649657
EXPECT_ANY_THROW({ utf8.get_chars(bytes, 2, 2, chars, 1); });
650658
}
651659

@@ -658,7 +666,7 @@ TEST_F(utf8_encoding_test, get_chars_with_not_enough_space_in_chars)
658666
std::vector<char16_t> chars;
659667
auto char_count = utf8.get_char_count(bytes, 2, 2);
660668

661-
EXPECT_EQ(1, char_count);
669+
EXPECT_EQ(static_cast<std::size_t>(1), char_count);
662670
EXPECT_ANY_THROW({ utf8.get_chars(bytes, 2, 2, chars, chars.size()); });
663671
}
664672

0 commit comments

Comments
 (0)