summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-12-25 13:59:47 -0500
committerDavid Robillard <d@drobilla.net>2017-12-25 16:26:13 -0500
commitd6a9571641bcb34acb3521feb08eea33195fd9ca (patch)
tree5c28e2800d829b7b1896e2fcbe3f8870b88e039d /tests
parent25177612b20f7d3ebd4138fed9cd9acffec7e756 (diff)
downloadingen-d6a9571641bcb34acb3521feb08eea33195fd9ca.tar.gz
ingen-d6a9571641bcb34acb3521feb08eea33195fd9ca.tar.bz2
ingen-d6a9571641bcb34acb3521feb08eea33195fd9ca.zip
Use nullptr
Diffstat (limited to 'tests')
-rw-r--r--tests/ingen_bench.cpp6
-rw-r--r--tests/ingen_test.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/ingen_bench.cpp b/tests/ingen_bench.cpp
index 0b5de841..f16908f6 100644
--- a/tests/ingen_bench.cpp
+++ b/tests/ingen_bench.cpp
@@ -35,7 +35,7 @@
using namespace std;
using namespace Ingen;
-World* world = NULL;
+World* world = nullptr;
static void
ingen_try(bool cond, const char* msg)
@@ -50,7 +50,7 @@ ingen_try(bool cond, const char* msg)
static std::string
real_path(const char* path)
{
- char* const c_real_path = realpath(path, NULL);
+ char* const c_real_path = realpath(path, nullptr);
const std::string result(c_real_path ? c_real_path : "");
free(c_real_path);
return result;
@@ -63,7 +63,7 @@ main(int argc, char** argv)
// Create world
try {
- world = new World(NULL, NULL, NULL);
+ world = new World(nullptr, nullptr, nullptr);
world->conf().add(
"output", "output", 'O', "File to write benchmark output",
Ingen::Configuration::SESSION, world->forge().String, Atom());
diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp
index 6ba91f33..459af215 100644
--- a/tests/ingen_test.cpp
+++ b/tests/ingen_test.cpp
@@ -56,7 +56,7 @@
using namespace std;
using namespace Ingen;
-World* world = NULL;
+World* world = nullptr;
static void
ingen_try(bool cond, const char* msg)
@@ -76,7 +76,7 @@ main(int argc, char** argv)
// Create world
try {
- world = new World(NULL, NULL, NULL);
+ world = new World(nullptr, nullptr, nullptr);
world->load_configuration(argc, argv);
} catch (std::exception& e) {
cout << "ingen: " << e.what() << endl;
@@ -93,7 +93,7 @@ main(int argc, char** argv)
// Get start graph and commands file options
const char* load_path = (const char*)load.get_body();
- char* real_start_graph = realpath(load_path, NULL);
+ char* real_start_graph = realpath(load_path, nullptr);
if (!real_start_graph) {
cerr << "error: initial graph '" << load_path << "' does not exist" << endl;
return EXIT_FAILURE;
@@ -147,7 +147,7 @@ main(int argc, char** argv)
SerdURI cmds_base;
SerdNode cmds_file_uri = serd_node_new_file_uri(
(const uint8_t*)cmds_file_path.c_str(),
- NULL, &cmds_base, true);
+ nullptr, &cmds_base, true);
Sord::Model* cmds = new Sord::Model(*world->rdf_world(),
(const char*)cmds_file_uri.buf);
SerdEnv* env = serd_env_new(&cmds_file_uri);