|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62833 - in branches/release: boost/tr1 boost/tr1/detail boost/tr1/tr1 libs/tr1 libs/tr1/test
From: john_at_[hidden]
Date: 2010-06-12 05:30:09
Author: johnmaddock
Date: 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
New Revision: 62833
URL: http://svn.boost.org/trac/boost/changeset/62833
Log:
Merge fixes from Trunk: mainly VC10 compatibility fixes.
Properties modified:
branches/release/boost/tr1/ (props changed)
branches/release/libs/tr1/ (props changed)
Text files modified:
branches/release/boost/tr1/array.hpp | 2
branches/release/boost/tr1/cmath.hpp | 2
branches/release/boost/tr1/complex.hpp | 2
branches/release/boost/tr1/detail/config.hpp | 46 +++++++++++++++++-------------
branches/release/boost/tr1/detail/config_all.hpp | 4 ++
branches/release/boost/tr1/functional.hpp | 2
branches/release/boost/tr1/memory.hpp | 2
branches/release/boost/tr1/random.hpp | 2
branches/release/boost/tr1/regex.hpp | 2
branches/release/boost/tr1/tr1/algorithm | 2
branches/release/boost/tr1/tr1/array | 4 +-
branches/release/boost/tr1/tr1/bitset | 2
branches/release/boost/tr1/tr1/cmath | 2
branches/release/boost/tr1/tr1/complex | 2
branches/release/boost/tr1/tr1/deque | 2
branches/release/boost/tr1/tr1/exception | 2
branches/release/boost/tr1/tr1/fstream | 2
branches/release/boost/tr1/tr1/functional | 2
branches/release/boost/tr1/tr1/iomanip | 2
branches/release/boost/tr1/tr1/ios | 2
branches/release/boost/tr1/tr1/iostream | 2
branches/release/boost/tr1/tr1/istream | 2
branches/release/boost/tr1/tr1/iterator | 2
branches/release/boost/tr1/tr1/limits | 2
branches/release/boost/tr1/tr1/list | 2
branches/release/boost/tr1/tr1/locale | 2
branches/release/boost/tr1/tr1/map | 2
branches/release/boost/tr1/tr1/memory | 2
branches/release/boost/tr1/tr1/new | 2
branches/release/boost/tr1/tr1/numeric | 2
branches/release/boost/tr1/tr1/ostream | 2
branches/release/boost/tr1/tr1/queue | 2
branches/release/boost/tr1/tr1/random | 4 +-
branches/release/boost/tr1/tr1/regex | 2
branches/release/boost/tr1/tr1/set | 2
branches/release/boost/tr1/tr1/sstream | 2
branches/release/boost/tr1/tr1/stack | 2
branches/release/boost/tr1/tr1/stdexcept | 2
branches/release/boost/tr1/tr1/streambuf | 2
branches/release/boost/tr1/tr1/string | 2
branches/release/boost/tr1/tr1/strstream | 4 ++
branches/release/boost/tr1/tr1/tuple | 4 +-
branches/release/boost/tr1/tr1/type_traits | 2
branches/release/boost/tr1/tr1/typeinfo | 2
branches/release/boost/tr1/tr1/unordered_map | 4 +-
branches/release/boost/tr1/tr1/unordered_set | 4 +-
branches/release/boost/tr1/tr1/utility | 2
branches/release/boost/tr1/tr1/valarray | 2
branches/release/boost/tr1/tr1/vector | 2
branches/release/boost/tr1/tuple.hpp | 2
branches/release/boost/tr1/type_traits.hpp | 2
branches/release/boost/tr1/unordered_map.hpp | 2
branches/release/boost/tr1/unordered_set.hpp | 2
branches/release/boost/tr1/utility.hpp | 2
branches/release/libs/tr1/test/run_complex_overloads.cpp | 60 ++++++++++++++++++++--------------------
55 files changed, 118 insertions(+), 108 deletions(-)
Modified: branches/release/boost/tr1/array.hpp
==============================================================================
--- branches/release/boost/tr1/array.hpp (original)
+++ branches/release/boost/tr1/array.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
#ifdef BOOST_HAS_TR1_ARRAY
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(array)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/cmath.hpp
==============================================================================
--- branches/release/boost/tr1/cmath.hpp (original)
+++ branches/release/boost/tr1/cmath.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
#ifdef BOOST_HAS_TR1_CMATH
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(cmath)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/complex.hpp
==============================================================================
--- branches/release/boost/tr1/complex.hpp (original)
+++ branches/release/boost/tr1/complex.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -27,7 +27,7 @@
#else
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(complex)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/detail/config.hpp
==============================================================================
--- branches/release/boost/tr1/detail/config.hpp (original)
+++ branches/release/boost/tr1/detail/config.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -8,7 +8,10 @@
#include <cstddef>
-#if defined(__GNUC__) || (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800))
+#if (defined(__GNUC__) && !(defined(linux) || defined(__linux) || defined(__linux__))) \
+ || (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800))
+ // Disable use of #include_next on Linux as typically we are installed in a
+ // directory that is searched *after* the std lib include path.
#if !defined(BOOST_HAS_INCLUDE_NEXT)
# define BOOST_HAS_INCLUDE_NEXT
#endif
@@ -134,25 +137,28 @@
// this here, in addition the feature pack for VC9
// provides a more or less full TR1 implementation:
//
-#if defined(_HAS_TR1) && (_HAS_TR1 + 0)
-# define BOOST_HAS_TR1_ARRAY
-# define BOOST_HAS_TR1_REFERENCE_WRAPPER
-# define BOOST_HAS_TR1_RESULT_OF
-# define BOOST_HAS_TR1_MEM_FN
-# define BOOST_HAS_TR1_BIND
-# define BOOST_HAS_TR1_FUNCTION
-# define BOOST_HAS_TR1_HASH
-# define BOOST_HAS_TR1_SHARED_PTR
-# define BOOST_HAS_TR1_RANDOM
-# define BOOST_HAS_TR1_REGEX
-# define BOOST_HAS_TR1_TUPLE
-# define BOOST_HAS_TR1_TYPE_TRAITS
-# define BOOST_HAS_TR1_UTILITY
-# define BOOST_HAS_TR1_UNORDERED_MAP
-# define BOOST_HAS_TR1_UNORDERED_SET
-#else
-# define BOOST_HAS_TR1_HASH
-#endif
+# if defined(_HAS_TR1) && (_HAS_TR1 + 0)
+# define BOOST_HAS_TR1_ARRAY
+# define BOOST_HAS_TR1_REFERENCE_WRAPPER
+# define BOOST_HAS_TR1_RESULT_OF
+# define BOOST_HAS_TR1_MEM_FN
+# define BOOST_HAS_TR1_BIND
+# define BOOST_HAS_TR1_FUNCTION
+# define BOOST_HAS_TR1_HASH
+# define BOOST_HAS_TR1_SHARED_PTR
+# define BOOST_HAS_TR1_RANDOM
+# define BOOST_HAS_TR1_REGEX
+# define BOOST_HAS_TR1_TUPLE
+# define BOOST_HAS_TR1_TYPE_TRAITS
+# define BOOST_HAS_TR1_UTILITY
+# define BOOST_HAS_TR1_UNORDERED_MAP
+# define BOOST_HAS_TR1_UNORDERED_SET
+# else
+# define BOOST_HAS_TR1_HASH
+# endif
+# if _MSC_VER >= 1600
+# define BOOST_HAS_CPP_0X
+# endif
#endif
#include <boost/config.hpp>
Modified: branches/release/boost/tr1/detail/config_all.hpp
==============================================================================
--- branches/release/boost/tr1/detail/config_all.hpp (original)
+++ branches/release/boost/tr1/detail/config_all.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -119,7 +119,9 @@
#ifdef __GXX_EXPERIMENTAL_CXX0X__
# define BOOST_HAS_CPP_0X
#endif
-
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) && !defined(BOOST_HAS_CPP_0X)
+# define BOOST_HAS_CPP_0X
+#endif
//
// We may be in the middle of parsing boost/config.hpp
// when this header is included, so don't rely on config
Modified: branches/release/boost/tr1/functional.hpp
==============================================================================
--- branches/release/boost/tr1/functional.hpp (original)
+++ branches/release/boost/tr1/functional.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
|| defined(BOOST_HAS_TR1_BIND)\
|| defined(BOOST_HAS_TR1_FUNCTION)\
|| defined(BOOST_HAS_TR1_HASH)
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(functional)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/memory.hpp
==============================================================================
--- branches/release/boost/tr1/memory.hpp (original)
+++ branches/release/boost/tr1/memory.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -59,7 +59,7 @@
#else
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(memory)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/random.hpp
==============================================================================
--- branches/release/boost/tr1/random.hpp (original)
+++ branches/release/boost/tr1/random.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
# include <boost/tr1/detail/config.hpp>
#ifdef BOOST_HAS_TR1_RANDOM
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(random)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/regex.hpp
==============================================================================
--- branches/release/boost/tr1/regex.hpp (original)
+++ branches/release/boost/tr1/regex.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
#ifdef BOOST_HAS_TR1_REGEX
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(regex)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/tr1/algorithm
==============================================================================
--- branches/release/boost/tr1/tr1/algorithm (original)
+++ branches/release/boost/tr1/tr1/algorithm 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_algorithm_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <algorithm>
# else
# include BOOST_TR1_STD_HEADER(algorithm)
Modified: branches/release/boost/tr1/tr1/array
==============================================================================
--- branches/release/boost/tr1/tr1/array (original)
+++ branches/release/boost/tr1/tr1/array 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
# include <boost/tr1/detail/config_all.hpp>
# ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <array>
# else
# include BOOST_TR1_STD_HEADER(array)
@@ -19,7 +19,7 @@
# if !defined(BOOST_TR1_NO_RECURSION)
# define BOOST_TR1_NO_RECURSION
# ifdef BOOST_HAS_TR1_ARRAY
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(array)
# else
# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(array))
Modified: branches/release/boost/tr1/tr1/bitset
==============================================================================
--- branches/release/boost/tr1/tr1/bitset (original)
+++ branches/release/boost/tr1/tr1/bitset 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_bitset_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <bitset>
# else
# include BOOST_TR1_STD_HEADER(bitset)
Modified: branches/release/boost/tr1/tr1/cmath
==============================================================================
--- branches/release/boost/tr1/tr1/cmath (original)
+++ branches/release/boost/tr1/tr1/cmath 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -17,7 +17,7 @@
# define BOOST_TR1_NO_CMATH_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <cmath>
# else
# include BOOST_TR1_STD_CHEADER(cmath)
Modified: branches/release/boost/tr1/tr1/complex
==============================================================================
--- branches/release/boost/tr1/tr1/complex (original)
+++ branches/release/boost/tr1/tr1/complex 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -11,7 +11,7 @@
# define BOOST_TR1_NO_COMPLEX_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <complex>
# else
# include BOOST_TR1_STD_HEADER(complex)
Modified: branches/release/boost/tr1/tr1/deque
==============================================================================
--- branches/release/boost/tr1/tr1/deque (original)
+++ branches/release/boost/tr1/tr1/deque 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_deque_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <deque>
# else
# include BOOST_TR1_STD_HEADER(deque)
Modified: branches/release/boost/tr1/tr1/exception
==============================================================================
--- branches/release/boost/tr1/tr1/exception (original)
+++ branches/release/boost/tr1/tr1/exception 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -21,7 +21,7 @@
#endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <exception>
# else
# include BOOST_TR1_STD_HEADER(exception)
Modified: branches/release/boost/tr1/tr1/fstream
==============================================================================
--- branches/release/boost/tr1/tr1/fstream (original)
+++ branches/release/boost/tr1/tr1/fstream 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_fstream_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <fstream>
# else
# include BOOST_TR1_STD_HEADER(fstream)
Modified: branches/release/boost/tr1/tr1/functional
==============================================================================
--- branches/release/boost/tr1/tr1/functional (original)
+++ branches/release/boost/tr1/tr1/functional 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -10,7 +10,7 @@
# define BOOST_TR1_NO_FUNCTIONAL_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <functional>
# else
# include BOOST_TR1_STD_HEADER(functional)
Modified: branches/release/boost/tr1/tr1/iomanip
==============================================================================
--- branches/release/boost/tr1/tr1/iomanip (original)
+++ branches/release/boost/tr1/tr1/iomanip 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_iomanip_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <iomanip>
# else
# include BOOST_TR1_STD_HEADER(iomanip)
Modified: branches/release/boost/tr1/tr1/ios
==============================================================================
--- branches/release/boost/tr1/tr1/ios (original)
+++ branches/release/boost/tr1/tr1/ios 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_ios_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <ios>
# else
# include BOOST_TR1_STD_HEADER(ios)
Modified: branches/release/boost/tr1/tr1/iostream
==============================================================================
--- branches/release/boost/tr1/tr1/iostream (original)
+++ branches/release/boost/tr1/tr1/iostream 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_iostream_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <iostream>
# else
# include BOOST_TR1_STD_HEADER(iostream)
Modified: branches/release/boost/tr1/tr1/istream
==============================================================================
--- branches/release/boost/tr1/tr1/istream (original)
+++ branches/release/boost/tr1/tr1/istream 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_istream_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <istream>
# else
# include BOOST_TR1_STD_HEADER(istream)
Modified: branches/release/boost/tr1/tr1/iterator
==============================================================================
--- branches/release/boost/tr1/tr1/iterator (original)
+++ branches/release/boost/tr1/tr1/iterator 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_iterator_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <iterator>
# else
# include BOOST_TR1_STD_HEADER(iterator)
Modified: branches/release/boost/tr1/tr1/limits
==============================================================================
--- branches/release/boost/tr1/tr1/limits (original)
+++ branches/release/boost/tr1/tr1/limits 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_limits_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <limits>
# else
# include BOOST_TR1_STD_HEADER(limits)
Modified: branches/release/boost/tr1/tr1/list
==============================================================================
--- branches/release/boost/tr1/tr1/list (original)
+++ branches/release/boost/tr1/tr1/list 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_list_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <list>
# else
# include BOOST_TR1_STD_HEADER(list)
Modified: branches/release/boost/tr1/tr1/locale
==============================================================================
--- branches/release/boost/tr1/tr1/locale (original)
+++ branches/release/boost/tr1/tr1/locale 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_locale_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <locale>
# else
# include BOOST_TR1_STD_HEADER(locale)
Modified: branches/release/boost/tr1/tr1/map
==============================================================================
--- branches/release/boost/tr1/tr1/map (original)
+++ branches/release/boost/tr1/tr1/map 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_map_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <map>
# else
# include BOOST_TR1_STD_HEADER(map)
Modified: branches/release/boost/tr1/tr1/memory
==============================================================================
--- branches/release/boost/tr1/tr1/memory (original)
+++ branches/release/boost/tr1/tr1/memory 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -11,7 +11,7 @@
# define BOOST_TR1_NO_MEMORY_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <memory>
# else
# include BOOST_TR1_STD_HEADER(memory)
Modified: branches/release/boost/tr1/tr1/new
==============================================================================
--- branches/release/boost/tr1/tr1/new (original)
+++ branches/release/boost/tr1/tr1/new 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -17,7 +17,7 @@
#endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <new>
# else
# include BOOST_TR1_STD_HEADER(new)
Modified: branches/release/boost/tr1/tr1/numeric
==============================================================================
--- branches/release/boost/tr1/tr1/numeric (original)
+++ branches/release/boost/tr1/tr1/numeric 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_numeric_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <numeric>
# else
# include BOOST_TR1_STD_HEADER(numeric)
Modified: branches/release/boost/tr1/tr1/ostream
==============================================================================
--- branches/release/boost/tr1/tr1/ostream (original)
+++ branches/release/boost/tr1/tr1/ostream 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_ostream_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <ostream>
# else
# include BOOST_TR1_STD_HEADER(ostream)
Modified: branches/release/boost/tr1/tr1/queue
==============================================================================
--- branches/release/boost/tr1/tr1/queue (original)
+++ branches/release/boost/tr1/tr1/queue 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_queue_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <queue>
# else
# include BOOST_TR1_STD_HEADER(queue)
Modified: branches/release/boost/tr1/tr1/random
==============================================================================
--- branches/release/boost/tr1/tr1/random (original)
+++ branches/release/boost/tr1/tr1/random 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
# include <boost/tr1/detail/config_all.hpp>
# ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <random>
# else
# include BOOST_TR1_STD_HEADER(random)
@@ -19,7 +19,7 @@
# if !defined(BOOST_TR1_NO_RECURSION)
# define BOOST_TR1_NO_RECURSION
# ifdef BOOST_HAS_TR1_RANDOM
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(random)
# else
# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(random))
Modified: branches/release/boost/tr1/tr1/regex
==============================================================================
--- branches/release/boost/tr1/tr1/regex (original)
+++ branches/release/boost/tr1/tr1/regex 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
# define BOOST_TR1_NO_RECURSION
# include <boost/tr1/detail/config_all.hpp>
# ifdef BOOST_HAS_TR1_REGEX
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(regex)
# else
# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(regex))
Modified: branches/release/boost/tr1/tr1/set
==============================================================================
--- branches/release/boost/tr1/tr1/set (original)
+++ branches/release/boost/tr1/tr1/set 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_set_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <set>
# else
# include BOOST_TR1_STD_HEADER(set)
Modified: branches/release/boost/tr1/tr1/sstream
==============================================================================
--- branches/release/boost/tr1/tr1/sstream (original)
+++ branches/release/boost/tr1/tr1/sstream 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_sstream_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <sstream>
# else
# include BOOST_TR1_STD_HEADER(sstream)
Modified: branches/release/boost/tr1/tr1/stack
==============================================================================
--- branches/release/boost/tr1/tr1/stack (original)
+++ branches/release/boost/tr1/tr1/stack 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_stack_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <stack>
# else
# include BOOST_TR1_STD_HEADER(stack)
Modified: branches/release/boost/tr1/tr1/stdexcept
==============================================================================
--- branches/release/boost/tr1/tr1/stdexcept (original)
+++ branches/release/boost/tr1/tr1/stdexcept 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -17,7 +17,7 @@
#endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <stdexcept>
# else
# include BOOST_TR1_STD_HEADER(stdexcept)
Modified: branches/release/boost/tr1/tr1/streambuf
==============================================================================
--- branches/release/boost/tr1/tr1/streambuf (original)
+++ branches/release/boost/tr1/tr1/streambuf 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_streambuf_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <streambuf>
# else
# include BOOST_TR1_STD_HEADER(streambuf)
Modified: branches/release/boost/tr1/tr1/string
==============================================================================
--- branches/release/boost/tr1/tr1/string (original)
+++ branches/release/boost/tr1/tr1/string 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_string_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <string>
# else
# include BOOST_TR1_STD_HEADER(string)
Modified: branches/release/boost/tr1/tr1/strstream
==============================================================================
--- branches/release/boost/tr1/tr1/strstream (original)
+++ branches/release/boost/tr1/tr1/strstream 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,8 +14,10 @@
# define BOOST_TR1_NO_strstream_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <strstream>
+# elif defined(__GNUC__) && (__GNUC__ >= 4) && defined(__GLIBCXX__) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
+# include <backward/strstream>
# else
# include BOOST_TR1_STD_HEADER(strstream)
# endif
Modified: branches/release/boost/tr1/tr1/tuple
==============================================================================
--- branches/release/boost/tr1/tr1/tuple (original)
+++ branches/release/boost/tr1/tr1/tuple 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
# include <boost/tr1/detail/config_all.hpp>
# ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <tuple>
# else
# include BOOST_TR1_STD_HEADER(tuple)
@@ -19,7 +19,7 @@
# if !defined(BOOST_TR1_NO_RECURSION)
# define BOOST_TR1_NO_RECURSION
# ifdef BOOST_HAS_TR1_TUPLE
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(tuple)
# else
# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(tuple))
Modified: branches/release/boost/tr1/tr1/type_traits
==============================================================================
--- branches/release/boost/tr1/tr1/type_traits (original)
+++ branches/release/boost/tr1/tr1/type_traits 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -18,7 +18,7 @@
# define BOOST_TR1_NO_RECURSION
# define BOOST_TR1_NO_TYPE_TRAITS_RECURSION
# endif
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <type_traits>
# else
# include BOOST_TR1_STD_HEADER(type_traits)
Modified: branches/release/boost/tr1/tr1/typeinfo
==============================================================================
--- branches/release/boost/tr1/tr1/typeinfo (original)
+++ branches/release/boost/tr1/tr1/typeinfo 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_typeinfo_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <typeinfo>
# else
# include BOOST_TR1_STD_HEADER(typeinfo)
Modified: branches/release/boost/tr1/tr1/unordered_map
==============================================================================
--- branches/release/boost/tr1/tr1/unordered_map (original)
+++ branches/release/boost/tr1/tr1/unordered_map 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
# include <boost/tr1/detail/config_all.hpp>
# ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <unordered_map>
# else
# include BOOST_TR1_STD_HEADER(unordered_map)
@@ -19,7 +19,7 @@
# if !defined(BOOST_TR1_NO_RECURSION)
# define BOOST_TR1_NO_RECURSION
# ifdef BOOST_HAS_TR1_UNORDERED_MAP
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(unordered_map)
# else
# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(unordered_map))
Modified: branches/release/boost/tr1/tr1/unordered_set
==============================================================================
--- branches/release/boost/tr1/tr1/unordered_set (original)
+++ branches/release/boost/tr1/tr1/unordered_set 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
# include <boost/tr1/detail/config_all.hpp>
# ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <unordered_map>
# else
# include BOOST_TR1_STD_HEADER(unordered_map)
@@ -19,7 +19,7 @@
# if !defined(BOOST_TR1_NO_RECURSION)
# define BOOST_TR1_NO_RECURSION
# ifdef BOOST_HAS_TR1_UNORDERED_SET
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(unordered_set)
# else
# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(unordered_set))
Modified: branches/release/boost/tr1/tr1/utility
==============================================================================
--- branches/release/boost/tr1/tr1/utility (original)
+++ branches/release/boost/tr1/tr1/utility 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -17,7 +17,7 @@
# define BOOST_TR1_NO_UTILITY_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <utility>
# else
# include BOOST_TR1_STD_HEADER(utility)
Modified: branches/release/boost/tr1/tr1/valarray
==============================================================================
--- branches/release/boost/tr1/tr1/valarray (original)
+++ branches/release/boost/tr1/tr1/valarray 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_valarray_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <valarray>
# else
# include BOOST_TR1_STD_HEADER(valarray)
Modified: branches/release/boost/tr1/tr1/vector
==============================================================================
--- branches/release/boost/tr1/tr1/vector (original)
+++ branches/release/boost/tr1/tr1/vector 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -14,7 +14,7 @@
# define BOOST_TR1_NO_vector_RECURSION
# endif
# include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next <vector>
# else
# include BOOST_TR1_STD_HEADER(vector)
Modified: branches/release/boost/tr1/tuple.hpp
==============================================================================
--- branches/release/boost/tr1/tuple.hpp (original)
+++ branches/release/boost/tr1/tuple.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
#ifdef BOOST_HAS_TR1_TUPLE
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(tuple)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/type_traits.hpp
==============================================================================
--- branches/release/boost/tr1/type_traits.hpp (original)
+++ branches/release/boost/tr1/type_traits.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
#ifdef BOOST_HAS_TR1_TYPE_TRAITS
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(type_traits)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/unordered_map.hpp
==============================================================================
--- branches/release/boost/tr1/unordered_map.hpp (original)
+++ branches/release/boost/tr1/unordered_map.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
#ifdef BOOST_HAS_TR1_UNORDERED_MAP
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(unordered_map)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/unordered_set.hpp
==============================================================================
--- branches/release/boost/tr1/unordered_set.hpp (original)
+++ branches/release/boost/tr1/unordered_set.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
#ifdef BOOST_HAS_TR1_UNORDERED_SET
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(unordered_set)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/boost/tr1/utility.hpp
==============================================================================
--- branches/release/boost/tr1/utility.hpp (original)
+++ branches/release/boost/tr1/utility.hpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -9,7 +9,7 @@
#ifdef BOOST_HAS_TR1_UTILITY
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
# include_next BOOST_TR1_HEADER(utility)
# else
# include <boost/tr1/detail/config_all.hpp>
Modified: branches/release/libs/tr1/test/run_complex_overloads.cpp
==============================================================================
--- branches/release/libs/tr1/test/run_complex_overloads.cpp (original)
+++ branches/release/libs/tr1/test/run_complex_overloads.cpp 2010-06-12 05:30:03 EDT (Sat, 12 Jun 2010)
@@ -34,7 +34,7 @@
//
template <class T, class U>
-void check(const T& t, const U& u)
+void do_check(const T& t, const U& u)
{
static const T two = 2;
static const T factor = std::pow(two, 1-std::numeric_limits<T>::digits) * 200;
@@ -43,11 +43,11 @@
}
template <class T, class U>
-void check(const std::complex<T>& t, const std::complex<U>& u)
+void do_check(const std::complex<T>& t, const std::complex<U>& u)
{
BOOST_STATIC_ASSERT((::boost::is_same<T,U>::value));
- check(t.real(), u.real());
- check(t.imag(), u.imag());
+ do_check(t.real(), u.real());
+ do_check(t.imag(), u.imag());
}
template <class T>
@@ -62,26 +62,26 @@
if(val)
{
std::cout << " Testing std::arg.\n";
- check(std::arg(cval), std::arg(rval));
- check(std::arg(cval), std::arg(val));
+ do_check(std::arg(cval), std::arg(rval));
+ do_check(std::arg(cval), std::arg(val));
}
std::cout << " Testing std::norm.\n";
- check(std::norm(cval), std::norm(rval));
- check(std::norm(cval), std::norm(val));
+ do_check(std::norm(cval), std::norm(rval));
+ do_check(std::norm(cval), std::norm(val));
std::cout << " Testing std::conj.\n";
- check(std::conj(cval), std::conj(rval));
- check(std::conj(cval), std::conj(val));
+ do_check(std::conj(cval), std::conj(rval));
+ do_check(std::conj(cval), std::conj(val));
std::cout << " Testing std::polar.\n";
- check(std::polar(val), std::polar(rval));
- check(std::polar(val, 0), std::polar(rval, 0));
- check(std::polar(val, val), std::polar(rval, rval));
- check(std::polar(val, rval), std::polar(rval, val));
+ do_check(std::polar(val), std::polar(rval));
+ do_check(std::polar(val, 0), std::polar(rval, 0));
+ do_check(std::polar(val, val), std::polar(rval, rval));
+ do_check(std::polar(val, rval), std::polar(rval, val));
std::cout << " Testing std::real.\n";
- check(std::real(cval), std::real(rval));
- check(std::real(cval), std::real(val));
+ do_check(std::real(cval), std::real(rval));
+ do_check(std::real(cval), std::real(val));
std::cout << " Testing std::imaj.\n";
- check(std::imag(cval), std::imag(rval));
- check(std::imag(cval), std::imag(val));
+ do_check(std::imag(cval), std::imag(rval));
+ do_check(std::imag(cval), std::imag(val));
if(val && !boost::is_floating_point<T>::value)
{
//
@@ -92,14 +92,14 @@
// Darwin is a particularly bad example !
//
std::cout << " Testing std::pow.\n";
- check(std::pow(cval, cval), std::pow(cval, val));
- check(std::pow(cval, cval), std::pow(cval, rval));
- check(std::pow(cval, cval), std::pow(val, cval));
- check(std::pow(cval, cval), std::pow(rval, cval));
+ do_check(std::pow(cval, cval), std::pow(cval, val));
+ do_check(std::pow(cval, cval), std::pow(cval, rval));
+ do_check(std::pow(cval, cval), std::pow(val, cval));
+ do_check(std::pow(cval, cval), std::pow(rval, cval));
}
}
-void check(double i)
+void do_check(double i)
{
std::cout << "Checking type double with value " << i << std::endl;
check_val(i);
@@ -109,7 +109,7 @@
check_val(static_cast<long double>(i));
}
-void check(int i)
+void do_check(int i)
{
std::cout << "Checking type char with value " << i << std::endl;
check_val(static_cast<char>(i));
@@ -140,16 +140,16 @@
std::cout << "Checking type unsigned __int64 with value " << i << std::endl;
check_val(static_cast<unsigned __int64>(i));
#endif
- check(static_cast<double>(i));
+ do_check(static_cast<double>(i));
}
int test_main(int, char*[])
{
- check(0);
- check(0.0);
- check(1);
- check(1.5);
- check(0.5);
+ do_check(0);
+ do_check(0.0);
+ do_check(1);
+ do_check(1.5);
+ do_check(0.5);
return 0;
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk