From 2f7d95af9caebfd5b14fbe78430bde2cfabf9fa4 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Sun, 3 Oct 2010 16:16:28 +0000
Subject: [PATCH] No longer using namespace boost, doing that lead to conflicts
 in new compilers, because both boost and std contain a shared_ptr type.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1517 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/data/pack.cpp          |  1 +
 src/data/pack.hpp          |  1 +
 src/util/io/get_member.cpp |  1 +
 src/util/io/reader.cpp     |  1 +
 src/util/io/writer.cpp     |  1 +
 src/util/smart_ptr.hpp     | 66 ++++++++------------------------------
 6 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/src/data/pack.cpp b/src/data/pack.cpp
index b9c64c6e..01074f82 100644
--- a/src/data/pack.cpp
+++ b/src/data/pack.cpp
@@ -12,6 +12,7 @@
 #include <data/game.hpp>
 #include <data/card.hpp>
 #include <queue>
+using boost::indeterminate;
 
 DECLARE_TYPEOF_COLLECTION(PackTypeP);
 DECLARE_TYPEOF_COLLECTION(PackItemP);
diff --git a/src/data/pack.hpp b/src/data/pack.hpp
index 46a9e0c2..48e67607 100644
--- a/src/data/pack.hpp
+++ b/src/data/pack.hpp
@@ -14,6 +14,7 @@
 #include <script/scriptable.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/logic/tribool.hpp>
+using boost::tribool;
 
 DECLARE_POINTER_TYPE(PackType);
 DECLARE_POINTER_TYPE(PackItem);
diff --git a/src/util/io/get_member.cpp b/src/util/io/get_member.cpp
index bd3a86cc..afa6fdba 100644
--- a/src/util/io/get_member.cpp
+++ b/src/util/io/get_member.cpp
@@ -12,6 +12,7 @@
 #include <script/script.hpp>
 #include <script/to_value.hpp>
 #include <boost/logic/tribool.hpp>
+using boost::tribool;
 
 // ---------------------------------------------------------------------------- : GetDefaultMember
 
diff --git a/src/util/io/reader.cpp b/src/util/io/reader.cpp
index a19b2f25..3080a8f2 100644
--- a/src/util/io/reader.cpp
+++ b/src/util/io/reader.cpp
@@ -13,6 +13,7 @@
 #include <util/io/package_manager.hpp>
 #include <boost/logic/tribool.hpp>
 #undef small
+using boost::tribool;
 
 typedef void (*ReaderPragmaHandler)(String&);
 DECLARE_DYNAMIC_ARG  (ReaderPragmaHandler,reader_pragma_handler);
diff --git a/src/util/io/writer.cpp b/src/util/io/writer.cpp
index 7032213d..61831671 100644
--- a/src/util/io/writer.cpp
+++ b/src/util/io/writer.cpp
@@ -13,6 +13,7 @@
 #include <util/version.hpp>
 #include <util/io/package.hpp>
 #include <boost/logic/tribool.hpp>
+using boost::tribool;
 
 // ----------------------------------------------------------------------------- : Writer
 
diff --git a/src/util/smart_ptr.hpp b/src/util/smart_ptr.hpp
index cd530ab3..d2ae6e54 100644
--- a/src/util/smart_ptr.hpp
+++ b/src/util/smart_ptr.hpp
@@ -24,10 +24,23 @@
 #define BOOST_SP_NO_SP_CONVERTIBLE
 
 #include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 #ifdef USE_INTRUSIVE_PTR
 	#include <boost/intrusive_ptr.hpp>
 #endif
-using namespace boost;
+
+// Can't do  using namespace boost;
+// because boost::shared_ptr conflicts with std::tr1::shared_ptr
+// and some boost headers do include boost/shared_ptr themselves
+#if _HAS_TR1
+	using std::tr1::shared_ptr;
+#else
+	using boost::shared_ptr;
+#endif
+using boost::intrusive_ptr;
+using boost::scoped_ptr;
+using boost::static_pointer_cast;
+using boost::dynamic_pointer_cast;
 
 // ----------------------------------------------------------------------------- : Declaring
 
@@ -47,57 +60,6 @@ inline shared_ptr<T> shared(T* ptr) {
 	return shared_ptr<T>(ptr);
 }
 
-/// Allocate a new shared-pointed object
-template <typename T>
-inline shared_ptr<T> new_shared() {
-	return shared_ptr<T>(new T());
-}
-/// Allocate a new shared-pointed object, given one argument to pass to the ctor of T
-template <typename T, typename A0>
-inline shared_ptr<T> new_shared1(const A0& a0) {
-	return shared_ptr<T>(new T(a0));
-}
-/// Allocate a new shared-pointed object, given two arguments to pass to the ctor of T
-template <typename T, typename A0, typename A1>
-inline shared_ptr<T> new_shared2(const A0& a0, const A1& a1) {
-	return shared_ptr<T>(new T(a0, a1));
-}
-/// Allocate a new shared-pointed object, given three arguments to pass to the ctor of T
-template <typename T, typename A0, typename A1, typename A2>
-inline shared_ptr<T> new_shared3(const A0& a0, const A1& a1, const A2& a2) {
-	return shared_ptr<T>(new T(a0, a1, a2));
-}
-/// Allocate a new shared-pointed object, given four arguments to pass to the ctor of T
-template <typename T, typename A0, typename A1, typename A2, typename A3>
-inline shared_ptr<T> new_shared4(const A0& a0, const A1& a1, const A2& a2, const A3& a3) {
-	return shared_ptr<T>(new T(a0, a1, a2, a3));
-}
-/// Allocate a new shared-pointed object, given five arguments to pass to the ctor of T
-template <typename T, typename A0, typename A1, typename A2, typename A3, typename A4>
-inline shared_ptr<T> new_shared5(const A0& a0, const A1& a1, const A2& a2, const A3& a3, const A4& a4) {
-	return shared_ptr<T>(new T(a0, a1, a2, a3, a4));
-}
-/// Allocate a new shared-pointed object, given six arguments to pass to the ctor of T
-template <typename T, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5>
-inline shared_ptr<T> new_shared6(const A0& a0, const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5) {
-	return shared_ptr<T>(new T(a0, a1, a2, a3, a4, a5));
-}
-/// Allocate a new shared-pointed object, given seven arguments to pass to the ctor of T
-template <typename T, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6>
-inline shared_ptr<T> new_shared7(const A0& a0, const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5, const A6& a6) {
-	return shared_ptr<T>(new T(a0, a1, a2, a3, a4, a5, a6));
-}
-/// Allocate a new shared-pointed object, given eight arguments to pass to the ctor of T
-template <typename T, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7>
-inline shared_ptr<T> new_shared8(const A0& a0, const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5, const A6& a6, const A7& a7) {
-	return shared_ptr<T>(new T(a0, a1, a2, a3, a4, a5, a6, a7));
-}
-/// Allocate a new shared-pointed object, given nine arguments to pass to the ctor of T
-template <typename T, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8>
-inline shared_ptr<T> new_shared9(const A0& a0, const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5, const A6& a6, const A7& a7, const A8& a8) {
-	return shared_ptr<T>(new T(a0, a1, a2, a3, a4, a5, a6, a7, a8));
-}
-
 // ----------------------------------------------------------------------------- : Intrusive pointers
 
 #ifdef USE_INTRUSIVE_PTR