From 22bcd529468c52c93033adb6c5311a70d531a5a5 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 11 Oct 2015 18:35:33 +0100
Subject: Use adhocutil's visibility

---
 slicer/json/Jamfile.jam      | 4 +++-
 slicer/json/serializer.h     | 5 +----
 slicer/slicer/Jamfile.jam    | 2 ++
 slicer/slicer/modelParts.h   | 4 +---
 slicer/slicer/parser.h       | 4 +---
 slicer/test/Jamfile.jam      | 1 +
 slicer/test/preprocessor.cpp | 2 +-
 slicer/xml/Jamfile.jam       | 2 ++
 slicer/xml/serializer.h      | 5 +----
 9 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/slicer/json/Jamfile.jam b/slicer/json/Jamfile.jam
index 3e047ee..d369eec 100644
--- a/slicer/json/Jamfile.jam
+++ b/slicer/json/Jamfile.jam
@@ -6,10 +6,11 @@ alias glibmm : : : :
 lib jsonpp : : : :
 	<cflags>"`pkg-config --cflags glibmm-2.4`"
 	;
-	
+
 lib boost_system ;
 lib boost_filesystem ;
 lib IceUtil ;
+lib adhocutil : : : : <include>/usr/include/adhocutil ;
 
 lib slicer-json :
 	[ glob *.cpp ]
@@ -20,6 +21,7 @@ lib slicer-json :
 	<library>IceUtil
 	<library>jsonpp
 	<library>glibmm
+	<library>adhocutil
 	<library>../slicer//slicer
 	<cflags>-fvisibility=hidden
 	<variant>release:<cflags>-flto
diff --git a/slicer/json/serializer.h b/slicer/json/serializer.h
index a1c75bd..55c48d3 100644
--- a/slicer/json/serializer.h
+++ b/slicer/json/serializer.h
@@ -3,10 +3,7 @@
 
 #include <slicer/serializer.h>
 #include <jsonpp.h>
-
-#ifndef DLL_PUBLIC
-#define DLL_PUBLIC __attribute__ ((visibility ("default")))
-#endif
+#include <visibility.h>
 
 namespace Slicer {
 	class JsonSerializer : public Serializer {
diff --git a/slicer/slicer/Jamfile.jam b/slicer/slicer/Jamfile.jam
index 8b477c0..016a357 100644
--- a/slicer/slicer/Jamfile.jam
+++ b/slicer/slicer/Jamfile.jam
@@ -2,6 +2,7 @@ lib Slice ;
 lib IceUtil ;
 lib boost_system ;
 lib boost_filesystem ;
+lib adhocutil : : : : <include>/usr/include/adhocutil ;
 
 lib slicer :
 	[ glob *.cpp ]
@@ -10,6 +11,7 @@ lib slicer :
 	<library>IceUtil
 	<library>boost_system
 	<library>boost_filesystem
+	<library>adhocutil
 	<include>..
 	<cflags>-fvisibility=hidden
 	<variant>release:<cflags>-flto
diff --git a/slicer/slicer/modelParts.h b/slicer/slicer/modelParts.h
index cc32cac..9cb2c96 100644
--- a/slicer/slicer/modelParts.h
+++ b/slicer/slicer/modelParts.h
@@ -11,9 +11,7 @@
 #include <boost/function.hpp>
 #include <boost/bimap.hpp>
 #include <vector>
-#ifndef DLL_PUBLIC
-#define DLL_PUBLIC __attribute__ ((visibility ("default")))
-#endif
+#include <visibility.h>
 
 namespace Slicer {
 	// This allows IceUtil::Handle to play nicely with boost::things
diff --git a/slicer/slicer/parser.h b/slicer/slicer/parser.h
index f5baef6..9322bbd 100644
--- a/slicer/slicer/parser.h
+++ b/slicer/slicer/parser.h
@@ -4,9 +4,7 @@
 #include <Slice/Parser.h>
 #include <boost/optional.hpp>
 #include <boost/filesystem/path.hpp>
-#ifndef DLL_PUBLIC
-#define DLL_PUBLIC __attribute__ ((visibility ("default")))
-#endif
+#include <visibility.h>
 
 namespace Slicer {
 	typedef boost::shared_ptr<FILE> FilePtr;
diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam
index e28e677..7776c5d 100644
--- a/slicer/test/Jamfile.jam
+++ b/slicer/test/Jamfile.jam
@@ -16,6 +16,7 @@ lib types :
 	<library>pthread
 	<library>Ice
 	<library>IceUtil
+	<library>adhocutil
 	<library>included//included
 	<implicit-dependency>included//included
 	: :
diff --git a/slicer/test/preprocessor.cpp b/slicer/test/preprocessor.cpp
index aa36ceb..9c1218b 100644
--- a/slicer/test/preprocessor.cpp
+++ b/slicer/test/preprocessor.cpp
@@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE( slicer_test_ice )
 
 	const fs::path obj = fs::change_extension(tmp / base, ".o");
 	const std::string compile = stringbf(
-					"g++ -Os -fPIC -c -std=c++0x -fvisibility=hidden -I tmp -I /usr/include/Ice -I /usr/include/IceUtil -I %s -I %s -I %s %s -o %s",
+					"g++ -Os -fPIC -c -std=c++0x -fvisibility=hidden -I tmp -I /usr/include/adhocutil -I /usr/include/Ice -I /usr/include/IceUtil -I %s -I %s -I %s %s -o %s",
 					root / bjamout,
 					included / bjamout,
 					root / "..",
diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam
index 74a5a05..ed2fbf1 100644
--- a/slicer/xml/Jamfile.jam
+++ b/slicer/xml/Jamfile.jam
@@ -4,6 +4,7 @@ alias libxmlpp : : : :
 lib boost_system ;
 lib boost_filesystem ;
 lib IceUtil ;
+lib adhocutil : : : : <include>/usr/include/adhocutil ;
 
 lib slicer-xml :
 	[ glob *.cpp ]
@@ -13,6 +14,7 @@ lib slicer-xml :
 	<library>boost_filesystem
 	<library>IceUtil
 	<library>libxmlpp
+	<library>adhocutil
 	<library>../slicer//slicer
 	<cflags>-fvisibility=hidden
 	<variant>release:<cflags>-flto
diff --git a/slicer/xml/serializer.h b/slicer/xml/serializer.h
index 2a21e57..f50435e 100644
--- a/slicer/xml/serializer.h
+++ b/slicer/xml/serializer.h
@@ -3,10 +3,7 @@
 
 #include <slicer/serializer.h>
 #include <libxml++/document.h>
-
-#ifndef DLL_PUBLIC
-#define DLL_PUBLIC __attribute__ ((visibility ("default")))
-#endif
+#include <visibility.h>
 
 namespace Slicer {
 	class XmlSerializer : public Serializer {
-- 
cgit v1.2.3