From 29bcb8c03925f069afa48c03ed12c400e8ea36f1 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 21 Jul 2020 19:40:42 +0200 Subject: Use nullptr in C++ header --- lilv/lilvmm.hpp | 4 ++-- wscript | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lilv/lilvmm.hpp b/lilv/lilvmm.hpp index cf719dd..4a90e6d 100644 --- a/lilv/lilvmm.hpp +++ b/lilv/lilvmm.hpp @@ -269,7 +269,7 @@ struct Instance { LILV_DEPRECATED inline Instance(Plugin plugin, double sample_rate) { - me = lilv_plugin_instantiate(plugin, sample_rate, NULL); + me = lilv_plugin_instantiate(plugin, sample_rate, nullptr); } LILV_DEPRECATED inline Instance(Plugin plugin, @@ -284,7 +284,7 @@ struct Instance { LilvInstance* me = lilv_plugin_instantiate( plugin, sample_rate, features); - return me ? new Instance(me) : NULL; + return me ? new Instance(me) : nullptr; } LILV_WRAP_CONVERSION(LilvInstance); diff --git a/wscript b/wscript index 6f1bad5..4fc641e 100644 --- a/wscript +++ b/wscript @@ -170,7 +170,6 @@ def configure(conf): autowaf.add_compiler_flags(conf.env, 'cxx', { 'clang': [ '-Wno-extra-semi', - '-Wno-zero-as-null-pointer-constant', ], 'gcc': [ '-Wno-effc++', -- cgit v1.2.1