fabi/Snappy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fully qualify std::string.

Browse Source 
This is in preparation for removing the snappy::string alias
of std::string.

PiperOrigin-RevId: 271383199
This commit is contained in:
Victor Costan
2019-09-26 10:47:14 -07:00
committed by Victor Costan
parent d837d5cfe1
commit 62363d9a79
8 changed files with 119 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
snappy-test.cc
View File

@@ -48,12 +48,12 @@ DEFINE_bool(run_microbenchmarks, true,
namespace snappy {
string ReadTestDataFile(const string& base, size_t size_limit) {
string contents;
std::string ReadTestDataFile(const std::string& base, size_t size_limit) {
std::string contents;
const char* srcdir = getenv("srcdir"); // This is set by Automake.
string prefix;
std::string prefix;
if (srcdir) {
prefix = string(srcdir) + "/";
prefix = std::string(srcdir) + "/";
}
file::GetContents(prefix + "testdata/" + base, &contents, file::Defaults()
).CheckSuccess();
@@ -63,11 +63,11 @@ string ReadTestDataFile(const string& base, size_t size_limit) {
return contents;
}
string ReadTestDataFile(const string& base) {
std::string ReadTestDataFile(const std::string& base) {
return ReadTestDataFile(base, 0);
}
string StringPrintf(const char* format, ...) {
std::string StringPrintf(const char* format, ...) {
char buf[4096];
va_list ap;
va_start(ap, format);
@@ -79,7 +79,7 @@ string StringPrintf(const char* format, ...) {
bool benchmark_running = false;
int64 benchmark_real_time_us = 0;
int64 benchmark_cpu_time_us = 0;
string *benchmark_label = NULL;
std::string* benchmark_label = nullptr;
int64 benchmark_bytes_processed = 0;
void ResetBenchmarkTiming() {
@@ -163,11 +163,11 @@ void StopBenchmarkTiming() {
benchmark_running = false;
}
void SetBenchmarkLabel(const string& str) {
void SetBenchmarkLabel(const std::string& str) {
if (benchmark_label) {
delete benchmark_label;
}
benchmark_label = new string(str);
benchmark_label = new std::string(str);
}
void SetBenchmarkBytesProcessed(int64 bytes) {
@@ -217,8 +217,8 @@ void Benchmark::Run() {
benchmark_runs[run].cpu_time_us = benchmark_cpu_time_us;
}
string heading = StringPrintf("%s/%d", name_.c_str(), test_case_num);
string human_readable_speed;
std::string heading = StringPrintf("%s/%d", name_.c_str(), test_case_num);
std::string human_readable_speed;
std::nth_element(benchmark_runs,
benchmark_runs + kMedianPos,