8 files changed, 14 insertions, 23 deletions
diff --git a/project2/ice/Jamfile.jam b/project2/ice/Jamfile.jam
index 22e74b6..42e1c99 100644
--- a/project2/ice/Jamfile.jam
+++ b/project2/ice/Jamfile.jam
@@ -14,8 +14,7 @@ lib slicer : : <name>slicer : : <include>/usr/include/slicer ;
 build-project unittests ;
 
 cpp-pch pch : pch.hpp :
-	<include>../../libmisc
-	<library>../lib//p2lib
+	<library>..//adhocutil
 	<library>../common//p2common
 	<library>glibmm 
 	<library>slicer 
@@ -24,10 +23,9 @@ cpp-pch pch : pch.hpp :
 lib p2iceclient :
 	pch iceDataSource.cpp iceClient.cpp buildClient.cpp slice2Task.cpp slice2Rows.cpp iceRows.cpp 
 	:
-	<include>../../libmisc
 	<library>glibmm
 	<library>../common//p2common
-	<library>../lib//p2lib
+	<library>..//adhocutil
 	<library>p2ice
 	<library>dl
 	<library>Ice
@@ -44,10 +42,9 @@ lib p2iceclient :
 lib p2icedaemon :
 	pch iceDaemon.cpp iceModule.cpp buildDaemon.cpp slice2Daemon.cpp iceViewSerializer.cpp
 	:
-	<include>../../libmisc
 	<library>glibmm
 	<library>../common//p2common
-	<library>../lib//p2lib
+	<library>..//adhocutil
 	<library>../basics//p2basics
 	<library>../daemon/lib//p2daemonlib
 	<library>p2ice
@@ -65,10 +62,9 @@ lib p2icedaemon :
 lib p2ice :
 	pch iceConvert.cpp iceCompile.cpp sliceCompile.cpp buildComms.cpp slice2Common.cpp iceBase.cpp
 	:
-	<include>../../libmisc
 	<library>glibmm
 	<library>../common//p2common
-	<library>../lib//p2lib
+	<library>..//adhocutil
 	<library>dl
 	<library>Ice
 	<library>Slice
diff --git a/project2/ice/buildComms.cpp b/project2/ice/buildComms.cpp
index 3ee548c..5bf80e7 100644
--- a/project2/ice/buildComms.cpp
+++ b/project2/ice/buildComms.cpp
@@ -1,7 +1,7 @@
 #include <pch.hpp>
 #include "buildComms.h"
 #include <logger.h>
-#include <misc.h>
+#include <buffer.h>
 #include <boost/filesystem/operations.hpp>
 #include <slicer/parser.h>
 
diff --git a/project2/ice/iceCompile.cpp b/project2/ice/iceCompile.cpp
index a518cde..9eb5cf5 100644
--- a/project2/ice/iceCompile.cpp
+++ b/project2/ice/iceCompile.cpp
@@ -2,7 +2,7 @@
 #include "iceCompile.h"
 #include <boost/filesystem/operations.hpp>
 #include <logger.h>
-#include <misc.h>
+#include <buffer.h>
 #include <dlfcn.h>
 
 namespace fs = boost::filesystem;
@@ -102,11 +102,9 @@ IceCompile::Compile(const fs::path & in, const fs::path & out)
 	if (components == 0) return;
 
 	const auto compile = stringbf(
-			"%s %s -o %s -x c++ -c -I %s -I %s -I ../libmisc/ -I %s -I %s -I %s -I %s -I %s `pkg-config --cflags glibmm-2.4` %s",
+			"%s %s -o %s -x c++ -c -I %s -I %s -I /usr/include/adhocutil -I %s -I %s -I %s `pkg-config --cflags glibmm-2.4` %s",
 			cxx, cxxopts, out, tmpdir,
 			slicerheaderdir,
-			headerdir.parent_path() / "libmisc",
-			headerdir / "lib",
 			headerdir / "common",
 			headerdir / "ice",
 			headerdir / "daemon" / "lib",
diff --git a/project2/ice/iceDaemon.cpp b/project2/ice/iceDaemon.cpp
index 14e7c90..ccd64a0 100644
--- a/project2/ice/iceDaemon.cpp
+++ b/project2/ice/iceDaemon.cpp
@@ -15,7 +15,6 @@
 #include <views/flatView.h>
 #include <taskHost.h>
 #include <execContext.h>
-#include <misc.h>
 #include <exceptions.h>
 #include "appInstance.h"
 
@@ -80,7 +79,7 @@ IceDaemon::setup() const
 	Logger()->messagebf(LOG_DEBUG, "  %s starting...", __PRETTY_FUNCTION__);
 	adapter->activate();
 }
-	
+
 
 void
 IceDaemon::run() const
@@ -125,7 +124,7 @@ class IceCallContext : public ExecContext {
 
 		VariableType getParameter(const VariableType & key) const
 		{
-			return safeMapLookup<ParamNotFound>(params, key);
+			return AdHoc::safeMapLookup<ParamNotFound>(params, key);
 		}
 
 		SessionPtr getSession() const
diff --git a/project2/ice/sliceCompile.cpp b/project2/ice/sliceCompile.cpp
index b879965..0544aea 100644
--- a/project2/ice/sliceCompile.cpp
+++ b/project2/ice/sliceCompile.cpp
@@ -1,6 +1,6 @@
 #include <pch.hpp>
 #include "sliceCompile.h"
-#include <scopeObject.h>
+#include <scopeExit.h>
 #include <mutex>
 
 std::mutex slicePreprocessor;
@@ -23,7 +23,7 @@ SliceCompile::build(const boost::filesystem::path & in, FILE * out) const
 	}
 
 	Slice::UnitPtr u = Slice::Unit::createUnit(false, false, false, false);
-	ScopeObject uDestroy(boost::bind(&Slice::Unit::destroy, u.get()));
+	AdHoc::ScopeExit uDestroy(boost::bind(&Slice::Unit::destroy, u.get()));
 
 	int parseStatus = u->parse(in.string(), cppHandle, false);
 
diff --git a/project2/ice/unittests/Jamfile.jam b/project2/ice/unittests/Jamfile.jam
index 4c9f94a..fe4ce51 100644
--- a/project2/ice/unittests/Jamfile.jam
+++ b/project2/ice/unittests/Jamfile.jam
@@ -8,8 +8,7 @@ lib unittestc :
 	<variant>component
 	<include>..
 	<include>../../common
-	<include>../../lib
-	<include>../../../libmisc
+	<include>/usr/include/adhocutil
 	<library>..//glibmm
 	: :
 	<include>.
diff --git a/project2/ice/unittests/testClient.cpp b/project2/ice/unittests/testClient.cpp
index 87ec04f..e979f82 100644
--- a/project2/ice/unittests/testClient.cpp
+++ b/project2/ice/unittests/testClient.cpp
@@ -10,7 +10,7 @@
 #include <scripts.h>
 #include <xmlScriptParser.h>
 #include <testScriptHost.h>
-#include <scopeObject.h>
+#include <scopeExit.h>
 #include <unittest.h>
 #include <unittestComplex.h>
 #include <testAppInstance.h>
@@ -125,7 +125,7 @@ commonTests(ExecContext * ec)
 	adapter->add(dummy, ic->stringToIdentity("testObject"));
 	adapter->add(dummyComplex, ic->stringToIdentity("testObjectComplex"));
 	adapter->activate();
-	ScopeObject _([&ic]{ ic->destroy(); });
+	AdHoc::ScopeExit _([&ic]{ ic->destroy(); });
 
 	BOOST_TEST_CHECKPOINT("Execute test script");
 	boost::intrusive_ptr<TestScriptHost> sr = new TestScriptHost(r);
diff --git a/project2/ice/unittests/testClientCompile.cpp b/project2/ice/unittests/testClientCompile.cpp
index 5369884..0332da7 100644
--- a/project2/ice/unittests/testClientCompile.cpp
+++ b/project2/ice/unittests/testClientCompile.cpp
@@ -7,7 +7,6 @@
 #include <exceptions.h>
 #include <scripts.h>
 #include <testScriptHost.h>
-#include <scopeObject.h>
 #include <testAppInstance.h>
 
 #define XSTR(s) STR(s)