Skip to content

Commit ddf1ec9

Browse files
committed
fix more warnings
1 parent 8af8a3c commit ddf1ec9

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

include/benchmark/benchmark.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@ class BENCHMARK_EXPORT Benchmark {
13041304
public:
13051305
const char* GetName() const;
13061306
int ArgsCnt() const;
1307-
const char* GetArgName(size_t arg) const;
1307+
const char* GetArgName(int arg) const;
13081308

13091309
private:
13101310
friend class BenchmarkFamilies;

src/benchmark_register.cc

+5-3
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,11 @@ int Benchmark::ArgsCnt() const {
480480
return static_cast<int>(args_.front().size());
481481
}
482482

483-
const char* Benchmark::GetArgName(size_t arg) const {
484-
BM_CHECK_LT(arg, arg_names_.size());
485-
return arg_names_[arg].c_str();
483+
const char* Benchmark::GetArgName(int arg) const {
484+
BM_CHECK_GE(arg, 0);
485+
size_t uarg = static_cast<size_t>(arg);
486+
BM_CHECK_LT(uarg, arg_names_.size());
487+
return arg_names_[uarg].c_str();
486488
}
487489

488490
TimeUnit Benchmark::GetTimeUnit() const {

test/benchmark_gtest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ TEST(AddRangeTest, Advanced64) {
3838

3939
TEST(AddRangeTest, FullRange8) {
4040
std::vector<int8_t> dst;
41-
AddRange(&dst, int8_t{1}, std::numeric_limits<int8_t>::max(), int8_t{8});
41+
AddRange(&dst, int8_t{1}, std::numeric_limits<int8_t>::max(), 8);
4242
EXPECT_THAT(
4343
dst, testing::ElementsAre(int8_t{1}, int8_t{8}, int8_t{64}, int8_t{127}));
4444
}

0 commit comments

Comments
 (0)