From bb5aca8a17448025852c02bd8df690024e966498 Mon Sep 17 00:00:00 2001
From: aramis_acg <aramis_acg@67173fc5-114c-0410-ac8e-9d2fd5bffc1f>
Date: Fri, 2 Apr 2010 00:17:58 +0000
Subject: [PATCH] Add TinyFormatter, a convenience wrapper around
 std::stringstream's, intended to replace boost.format. Fix non-standard
 friend declaration in noboost/shared_ptr. Deprecate boost.format workaround.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@632 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
---
 code/BoostWorkaround/boost/format.hpp     |   6 +
 code/BoostWorkaround/boost/shared_ptr.hpp |   4 +-
 code/TinyFormatter.h                      | 127 ++++++++++++++++++++++
 3 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 code/TinyFormatter.h

diff --git a/code/BoostWorkaround/boost/format.hpp b/code/BoostWorkaround/boost/format.hpp
index 6e65d8fc3..5d02899ab 100644
--- a/code/BoostWorkaround/boost/format.hpp
+++ b/code/BoostWorkaround/boost/format.hpp
@@ -1,5 +1,11 @@
 
 
+
+/* DEPRECATED placebo workaround, use code/TinyFormatter.h instead.
+ *
+ *
+ * */
+
 #ifndef AI_BOOST_FORMAT_DUMMY_INCLUDED
 #define AI_BOOST_FORMAT_DUMMY_INCLUDED
 
diff --git a/code/BoostWorkaround/boost/shared_ptr.hpp b/code/BoostWorkaround/boost/shared_ptr.hpp
index 081980739..456c0ef05 100644
--- a/code/BoostWorkaround/boost/shared_ptr.hpp
+++ b/code/BoostWorkaround/boost/shared_ptr.hpp
@@ -54,7 +54,7 @@ namespace boost {
 			static yes foo(DEST*);
 			static no  foo(...);
 
-			enum {result = sizeof foo((SRC*)0) == sizeof yes};	
+			enum {result = (sizeof(foo((SRC*)0)) == sizeof(yes) ? 1 : 0)};	
 		};
 
 		template <bool> struct enable_if {};
@@ -74,7 +74,7 @@ namespace boost {
 template <class T>
 class shared_ptr
 {
-	friend class shared_ptr;
+	template <typename TT> friend class shared_ptr;
 public:
 
 	// provide a default construtctor
diff --git a/code/TinyFormatter.h b/code/TinyFormatter.h
new file mode 100644
index 000000000..a79cfbe3b
--- /dev/null
+++ b/code/TinyFormatter.h
@@ -0,0 +1,127 @@
+/*
+Open Asset Import Library (ASSIMP)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2008, ASSIMP Development Team
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, 
+with or without modification, are permitted provided that the 
+following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the ASSIMP team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the ASSIMP Development Team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------
+*/
+
+/** @file  TinyFormatter.h
+ *  @brief Utility to format log messages more easily. Introduced
+ *    to get rid of the boost::format dependency. Much slinker,
+ *    basically just extends stringstream.
+ */
+#ifndef INCLUDED_TINY_FORMATTER_H
+#define INCLUDED_TINY_FORMATTER_H
+
+#include <sstream>
+
+namespace Assimp {
+	namespace Formatter {
+
+// ------------------------------------------------------------------------------------------------
+/** stringstream utility. Usage:
+ *  @code
+ *  void writelog(const std::string&s);
+ *  void writelog(const std::wstring&s);
+ *  ...
+ *  writelog(format()<< "hi! this is a number: " << 4);
+ *  writelog(wformat()<< L"hi! this is a number: " << 4);
+ *
+ *  @endcode */
+template < typename T,
+	typename CharTraits = std::char_traits<T>,
+	typename Allocator  = std::allocator<T>
+> 
+class basic_formatter 
+{
+
+public:
+
+	typedef class std::basic_string< 
+		T,CharTraits,Allocator
+	> string;
+
+	typedef class std::basic_ostringstream< 
+		T,CharTraits,Allocator
+	> stringstream;
+
+public:
+
+	basic_formatter() {}
+
+	/* Allow basic_formatter<T>'s to be used almost interchangeably
+	 * with std::(w)string or const (w)char* arguments because the
+	 * conversion c'tor is called implicitly. */
+	template <typename TT>
+	basic_formatter(const TT& sin)	{
+		underlying << sin;
+	}
+
+public:
+
+	operator string () {
+		return underlying.str();
+	}
+
+
+	/* note - this is declared const because binding temporaries does only
+	 * work for const references, so many function prototypes will 
+	 * include const basic_formatter<T>& s but might still want to
+	 * modify the formatted string without the need for a full copy.*/
+	template <typename TToken>
+	const basic_formatter& operator << (const TToken& s) const {
+		underlying << s;
+		return *this;
+	}
+
+	template <typename TToken>
+	basic_formatter& operator << (const TToken& s) {
+		underlying << s;
+		return *this;
+	}
+
+private:
+	mutable stringstream underlying;
+};
+
+
+typedef basic_formatter< char > format;
+typedef basic_formatter< wchar_t > wformat;
+
+} // ! namespace Formatter 
+
+} // ! namespace Assimp
+#endif