summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-01-21 21:40:32 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2016-01-21 21:40:32 +0000
commitb15a0702121de70ae088e25bdd3b5657c599df96 (patch)
tree89ce015c27aada8ac2e81a5d3efd15855c16933a
parentAdd code parsing URI structures (diff)
downloadlibadhocutil-b15a0702121de70ae088e25bdd3b5657c599df96.tar.bz2
libadhocutil-b15a0702121de70ae088e25bdd3b5657c599df96.tar.xz
libadhocutil-b15a0702121de70ae088e25bdd3b5657c599df96.zip
Fix test case use of nullptr
-rw-r--r--libadhocutil/unittests/Jamfile.jam3
-rw-r--r--libadhocutil/unittests/testPluginsRuntime.cpp2
2 files changed, 4 insertions, 1 deletions
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>