From b15a0702121de70ae088e25bdd3b5657c599df96 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 21 Jan 2016 21:40:32 +0000
Subject: Fix test case use of nullptr

---
 libadhocutil/unittests/Jamfile.jam            | 3 +++
 libadhocutil/unittests/testPluginsRuntime.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libadhocutil/unittests/Jamfile.jam b/libadhocutil/unittests/Jamfile.jam
index 9a180a7..ea93cb4 100644
--- a/libadhocutil/unittests/Jamfile.jam
+++ b/libadhocutil/unittests/Jamfile.jam
@@ -135,6 +135,9 @@ run
 
 lib utilTestClasses :
 	utilTestClasses.cpp
+	:
+	<cflags>-fvisibility=hidden
+	<library>..//adhocutil
 	: :
 	<define>BOOST_TEST_DYN_LINK
 	<library>..//adhocutil
diff --git a/libadhocutil/unittests/testPluginsRuntime.cpp b/libadhocutil/unittests/testPluginsRuntime.cpp
index 9185cdc..68d94d5 100644
--- a/libadhocutil/unittests/testPluginsRuntime.cpp
+++ b/libadhocutil/unittests/testPluginsRuntime.cpp
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE( loadAndUnloadlib )
 boost::optional<std::string>
 nullResolver(const std::type_info &, const std::string &)
 {
-	return nullptr;
+	return boost::optional<std::string>();
 }
 
 boost::optional<std::string>
-- 
cgit v1.2.3