From 59f8144c50765189594d5932fc25869f9ea6e265 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 19 Oct 2013 18:19:03 +0200 Subject: *: use nullptr instead of NULL --- src/DatabaseSelection.hxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/DatabaseSelection.hxx') diff --git a/src/DatabaseSelection.hxx b/src/DatabaseSelection.hxx index 7fab2d303..8ef5b6d9c 100644 --- a/src/DatabaseSelection.hxx +++ b/src/DatabaseSelection.hxx @@ -23,7 +23,6 @@ #include "Compiler.h" #include -#include class SongFilter; struct Song; @@ -31,7 +30,7 @@ struct Song; struct DatabaseSelection { /** * The base URI of the search (UTF-8). Must not begin or end - * with a slash. NULL or an empty string searches the whole + * with a slash. nullptr or an empty string searches the whole * database. */ const char *uri; @@ -46,7 +45,7 @@ struct DatabaseSelection { DatabaseSelection(const char *_uri, bool _recursive, const SongFilter *_filter=nullptr) :uri(_uri), recursive(_recursive), filter(_filter) { - assert(uri != NULL); + assert(uri != nullptr); } gcc_pure -- cgit v1.2.3