summaryrefslogtreecommitdiff
path: root/benchmarks/bionic_benchmarks.cpp
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2018-08-02 17:31:13 -0700
committerYi Kong <yikong@google.com>2018-08-02 18:09:44 -0700
commit32bc0fcf69dfccb3726fe572833a38b01179580e (patch)
treeabca656f500087493e0997d5cf38cbcc9ec98eb8 /benchmarks/bionic_benchmarks.cpp
parent65f82092a17518080178ff7004cc6db362ebfbcd (diff)
Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning. Test: m Bug: 68236239 Change-Id: I5b4123bc6709641315120a191e36cc57541349b2
Diffstat (limited to 'benchmarks/bionic_benchmarks.cpp')
-rw-r--r--benchmarks/bionic_benchmarks.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/benchmarks/bionic_benchmarks.cpp b/benchmarks/bionic_benchmarks.cpp
index e4c32fa1f..4a19fe1a9 100644
--- a/benchmarks/bionic_benchmarks.cpp
+++ b/benchmarks/bionic_benchmarks.cpp
@@ -78,12 +78,12 @@ std::mutex g_map_lock;
static struct option g_long_options[] =
{
- {"bionic_cpu", required_argument, 0, 'c'},
- {"bionic_xml", required_argument, 0, 'x'},
- {"bionic_iterations", required_argument, 0, 'i'},
- {"bionic_extra", required_argument, 0, 'a'},
- {"help", no_argument, 0, 'h'},
- {0, 0, 0, 0},
+ {"bionic_cpu", required_argument, nullptr, 'c'},
+ {"bionic_xml", required_argument, nullptr, 'x'},
+ {"bionic_iterations", required_argument, nullptr, 'i'},
+ {"bionic_extra", required_argument, nullptr, 'a'},
+ {"help", no_argument, nullptr, 'h'},
+ {nullptr, 0, nullptr, 0},
};
typedef std::vector<std::vector<int64_t>> args_vector_t;
@@ -100,7 +100,7 @@ void Usage() {
int fake_argc = 2;
char argv0[] = "bionic_benchmarks";
char argv1[] = "--help";
- char* fake_argv[3] {argv0, argv1, NULL};
+ char* fake_argv[3] {argv0, argv1, nullptr};
benchmark::Initialize(&fake_argc, fake_argv);
exit(1);
}
@@ -132,7 +132,7 @@ void SanitizeOpts(int argc, char** argv, std::vector<char*>* new_argv) {
}
}
}
- new_argv->push_back(0);
+ new_argv->push_back(nullptr);
}
bench_opts_t ParseOpts(int argc, char** argv) {