From 9c86066079e9648ce1b509182109e87de1a1cea4 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 24 Mar 2018 12:37:13 +0000
Subject: Upgrade to Ice-3.7

---
 Jamroot.jam                              | 15 ++++++++-------
 libadhocutil/Jamfile.jam                 |  8 +++-----
 libadhocutil/unittests/Jamfile.jam       |  3 +++
 libadhocutil/unittests/testOptionals.cpp | 10 +++++-----
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Jamroot.jam b/Jamroot.jam
index b8e5681..811c240 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -7,13 +7,14 @@ variant coverage : debug ;
 
 project
   : requirements
-      <cxxflags>"-std=c++17 -fvisibility=hidden -fvisibility-inlines-hidden"
-      <linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
-      <variant>release:<cxxflags>"-flto=2"
-      <variant>release:<linkflags>"-flto=2"
-      <variant>debug:<cxxflags>"-W -Wall -Werror -Wextra"
-      <variant>coverage:<cxxflags>"--coverage"
-      <variant>coverage:<linkflags>"--coverage"
+			<define>ICE_CPP11_MAPPING
+			<cxxflags>"-std=c++17 -fvisibility=hidden -fvisibility-inlines-hidden"
+			<linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
+			<variant>release:<cxxflags>"-flto=2"
+			<variant>release:<linkflags>"-flto=2"
+			<variant>debug:<cxxflags>"-W -Wall -Werror -Wextra"
+			<variant>coverage:<cxxflags>"--coverage"
+			<variant>coverage:<linkflags>"--coverage"
 	;
 
 build-project libadhocutil ;
diff --git a/libadhocutil/Jamfile.jam b/libadhocutil/Jamfile.jam
index 5793a8d..0a11b72 100644
--- a/libadhocutil/Jamfile.jam
+++ b/libadhocutil/Jamfile.jam
@@ -4,19 +4,16 @@ import lex ;
 lib boost_system ;
 lib boost_filesystem ;
 lib boost_thread ;
-lib Ice : ;
-lib IceUtil ;
+lib Ice++11 : ;
 lib pthread ;
 lib curl ;
 lib dl ;
 
-alias iceall : : : : <library>Ice <library>IceUtil <library>pthread ;
-
 lib adhocutil :
 	[ glob *.ll *.cpp *.ice : bin ]
 	:
 	<include>.
-	<library>iceall
+	<library>Ice++11
 	<library>boost_system
 	<library>boost_filesystem
 	<library>boost_thread
@@ -25,6 +22,7 @@ lib adhocutil :
 	<library>dl
 	: :
 	<include>.
+	<library>Ice++11
 	;
 
 build-project unittests ;
diff --git a/libadhocutil/unittests/Jamfile.jam b/libadhocutil/unittests/Jamfile.jam
index 2fb148b..8a58ca0 100644
--- a/libadhocutil/unittests/Jamfile.jam
+++ b/libadhocutil/unittests/Jamfile.jam
@@ -6,6 +6,7 @@ lib boost_utf : : <name>boost_unit_test_framework ;
 lib boost_filesystem ;
 lib boost_system ;
 lib boost_thread ;
+lib pthread ;
 lib dl ;
 
 run
@@ -210,6 +211,7 @@ run
 	<library>..//adhocutil
 	<library>boost_utf
 	<library>boost_system
+	<library>pthread
 	:
 	testSemaphore
 	;
@@ -232,6 +234,7 @@ run
 	<library>boost_utf
 	<library>boost_thread
 	<library>boost_system
+	<library>pthread
 	:
 	testResourcePool
 	;
diff --git a/libadhocutil/unittests/testOptionals.cpp b/libadhocutil/unittests/testOptionals.cpp
index f97b37b..793e1e5 100644
--- a/libadhocutil/unittests/testOptionals.cpp
+++ b/libadhocutil/unittests/testOptionals.cpp
@@ -3,8 +3,8 @@
 
 #include <optionalUtils.h>
 #include <boost/optional.hpp>
-#include <IceUtil/Exception.h>
-#include <IceUtil/Optional.h>
+#include <Ice/Exception.h>
+#include <Ice/Optional.h>
 
 using namespace AdHoc;
 
@@ -12,12 +12,12 @@ BOOST_AUTO_TEST_CASE ( general )
 {
 	boost::optional<int> x;
 	boost::optional<double> y = 2.3;
-	IceUtil::Optional<float> ix;
-	IceUtil::Optional<short> iy = 4;
+	Ice::optional<float> ix;
+	Ice::optional<short> iy = 4;
 	std::string * p = nullptr;
 	std::string * q = new std::string("str");
 	boost::optional<std::string> r;
-	IceUtil::Optional<std::string> s;
+	Ice::optional<std::string> s;
 
 	bool b(p);
 	BOOST_REQUIRE_EQUAL(false, b);
-- 
cgit v1.2.3