generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Work around some unsigned->signed warnings in our tests/.

Browse Source 
Thanks to Diego Barrios Romero <eldruin@gmail.com>.
This commit is contained in:
kosak
2015-04-28 21:59:44 +00:00
parent 5c996c6466
commit f8c44a0ae4
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/gtest-listener_test.cc
View File

@@ -176,16 +176,16 @@ using ::testing::internal::EventRecordingListener;
void VerifyResults(const std::vector<std::string>& data,
const char* const* expected_data,
int expected_data_size) {
const int actual_size = data.size();
size_t expected_data_size) {
const size_t actual_size = data.size();
// If the following assertion fails, a new entry will be appended to
// data. Hence we save data.size() first.
EXPECT_EQ(expected_data_size, actual_size);
// Compares the common prefix.
const int shorter_size = expected_data_size <= actual_size ?
const size_t shorter_size = expected_data_size <= actual_size ?
expected_data_size : actual_size;
int i = 0;
size_t i = 0;
for (; i < shorter_size; ++i) {
ASSERT_STREQ(expected_data[i], data[i].c_str())
<< "at position " << i;
@@ -193,7 +193,8 @@ void VerifyResults(const std::vector<std::string>& data,
// Prints extra elements in the actual data.
for (; i < actual_size; ++i) {
printf(" Actual event #%d: %s\n", i, data[i].c_str());
printf(" Actual event #%lu: %s\n",
static_cast<unsigned long>(i), data[i].c_str());
}
}