From d83127722f2aad4e5d1ebd8aa91d7490893b0d51 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 7 Jan 2015 18:55:31 +0100
Subject: [PATCH] output/oss: use nullptr instead of NULL

---
 src/output/plugins/OssOutputPlugin.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index b895046f0..1b14e16c7 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -199,7 +199,7 @@ oss_open_default(Error &error)
 			OssOutput *od = new OssOutput(default_devices[i]);
 			if (!od->Initialize(empty, error)) {
 				delete od;
-				return NULL;
+				return nullptr;
 			}
 
 			return od;
@@ -232,18 +232,18 @@ oss_open_default(Error &error)
 
 	error.Set(oss_output_domain,
 		  "error trying to open default OSS device");
-	return NULL;
+	return nullptr;
 }
 
 inline OssOutput *
 OssOutput::Create(const config_param &param, Error &error)
 {
 	const char *device = param.GetBlockValue("device");
-	if (device != NULL) {
+	if (device != nullptr) {
 		OssOutput *od = new OssOutput();
 		if (!od->Initialize(param, error)) {
 			delete od;
-			return NULL;
+			return nullptr;
 		}
 
 		od->device = device;
@@ -280,8 +280,8 @@ oss_try_ioctl_r(int fd, unsigned long request, int *value_r,
 		const char *msg, Error &error)
 {
 	assert(fd >= 0);
-	assert(value_r != NULL);
-	assert(msg != NULL);
+	assert(value_r != nullptr);
+	assert(msg != nullptr);
 	assert(!error.IsDefined());
 
 	int ret = ioctl(fd, request, value_r);