summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-07-21 19:40:42 +0200
committerDavid Robillard <d@drobilla.net>2020-07-21 19:40:42 +0200
commit29bcb8c03925f069afa48c03ed12c400e8ea36f1 (patch)
tree5d53eb6767afae43941488815a6747c8d798739d
parent1ba75a48418168bb3d366346a92c4aae87f8d83b (diff)
downloadlilv-29bcb8c03925f069afa48c03ed12c400e8ea36f1.tar.gz
lilv-29bcb8c03925f069afa48c03ed12c400e8ea36f1.tar.bz2
lilv-29bcb8c03925f069afa48c03ed12c400e8ea36f1.zip
Use nullptr in C++ header
-rw-r--r--lilv/lilvmm.hpp4
-rw-r--r--wscript1
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++',