Fix benchmark C++11 code
diff --git a/snappy_benchmark.cc b/snappy_benchmark.cc index 98501ea..d6e35d3 100644 --- a/snappy_benchmark.cc +++ b/snappy_benchmark.cc
@@ -31,12 +31,10 @@ #include <string> #include <vector> -#include "snappy-test.h" - #include "benchmark/benchmark.h" - #include "snappy-internal.h" #include "snappy-sinksource.h" +#include "snappy-test.h" #include "snappy.h" #include "snappy_test_data.h" @@ -44,7 +42,7 @@ namespace { -void FilesAndLevels(::testing::Benchmark* benchmark) { +void FilesAndLevels(benchmark::internal::Benchmark* benchmark) { for (int i = 0; i < ARRAYSIZE(kTestDataFiles); ++i) { for (int level = snappy::CompressionOptions::MinCompressionLevel(); level <= snappy::CompressionOptions::MaxCompressionLevel(); ++level) { @@ -64,8 +62,9 @@ kTestDataFiles[file_index].size_limit); std::string zcontents; - snappy::Compress(contents.data(), contents.size(), &zcontents, - snappy::CompressionOptions{/*level=*/state.range(1)}); + snappy::Compress( + contents.data(), contents.size(), &zcontents, + snappy::CompressionOptions{/*level=*/static_cast<int>(state.range(1))}); char* dst = new char[contents.size()]; for (auto s : state) { @@ -129,8 +128,9 @@ kTestDataFiles[file_index].size_limit); std::string zcontents; - snappy::Compress(contents.data(), contents.size(), &zcontents, - snappy::CompressionOptions{/*level=*/state.range(1)}); + snappy::Compress( + contents.data(), contents.size(), &zcontents, + snappy::CompressionOptions{/*level=*/static_cast<int>(state.range(1))}); for (auto s : state) { CHECK(snappy::IsValidCompressedBuffer(zcontents.data(), zcontents.size())); @@ -226,7 +226,7 @@ // Uncompress into an iovec containing ten entries. const int kNumEntries = 10; struct iovec iov[kNumEntries]; - char *dst = new char[contents.size()]; + char* dst = new char[contents.size()]; size_t used_so_far = 0; for (int i = 0; i < kNumEntries; ++i) { iov[i].iov_base = dst + used_so_far; @@ -267,8 +267,9 @@ kTestDataFiles[file_index].size_limit); std::string zcontents; - snappy::Compress(contents.data(), contents.size(), &zcontents, - snappy::CompressionOptions{/*level=*/state.range(1)}); + snappy::Compress( + contents.data(), contents.size(), &zcontents, + snappy::CompressionOptions{/*level=*/static_cast<int>(state.range(1))}); char* dst = new char[contents.size()]; for (auto s : state) {