Subject: [Boost-commit] svn:boost r59679 - in branches/release: boost/detail libs/functional/hash libs/functional/hash/test
From: daniel_james_at_[hidden]
Date: 2010-02-14 11:31:22
Author: danieljames
Date: 2010-02-14 11:31:21 EST (Sun, 14 Feb 2010)
New Revision: 59679
URL: http://svn.boost.org/trac/boost/changeset/59679
Log:
Merge some detail changes.
- [53670] Avoid C style casts.
- [55604] Fix #3346 boost/detail/scoped_enum_emulation.hpp enum_t conflict
with Unix rpc/types.h
- Don't foward declare containers when using gcc's parallel library and add a
macro to disable forward declaration. Fixes #3866.
Added:
branches/release/libs/functional/hash/test/container_no_fwd_test.cpp
- copied unchanged from r59282, /trunk/libs/functional/hash/test/container_no_fwd_test.cpp
Properties modified:
branches/release/libs/functional/hash/ (props changed)
Text files modified:
branches/release/boost/detail/container_fwd.hpp | 4 +++-
branches/release/boost/detail/lcast_precision.hpp | 4 ++--
branches/release/boost/detail/scoped_enum_emulation.hpp | 4 ++--
branches/release/libs/functional/hash/test/Jamfile.v2 | 1 +
4 files changed, 8 insertions(+), 5 deletions(-)
Modified: branches/release/boost/detail/container_fwd.hpp
==============================================================================
--- branches/release/boost/detail/container_fwd.hpp (original)
+++ branches/release/boost/detail/container_fwd.hpp 2010-02-14 11:31:21 EST (Sun, 14 Feb 2010)
@@ -13,7 +13,9 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
-#if ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) && defined(_GLIBCXX_DEBUG)) \
+#if defined(BOOST_DETAIL_NO_CONTAINER_FWD) \
+ || ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) \
+ && (defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL))) \
|| BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
|| BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
|| (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
Modified: branches/release/boost/detail/lcast_precision.hpp
==============================================================================
--- branches/release/boost/detail/lcast_precision.hpp (original)
+++ branches/release/boost/detail/lcast_precision.hpp 2010-02-14 11:31:21 EST (Sun, 14 Feb 2010)
@@ -173,8 +173,8 @@
template<class Source, class Target>
inline void lcast_set_precision(std::ios_base& stream, Source*, Target*)
{
- std::streamsize const s = lcast_get_precision((Source*)0);
- std::streamsize const t = lcast_get_precision((Target*)0);
+ std::streamsize const s = lcast_get_precision(static_cast<Source*>(0));
+ std::streamsize const t = lcast_get_precision(static_cast<Target*>(0));
stream.precision(s > t ? s : t);
}
Modified: branches/release/boost/detail/scoped_enum_emulation.hpp
==============================================================================
--- branches/release/boost/detail/scoped_enum_emulation.hpp (original)
+++ branches/release/boost/detail/scoped_enum_emulation.hpp 2010-02-14 11:31:21 EST (Sun, 14 Feb 2010)
@@ -41,9 +41,9 @@
#ifdef BOOST_NO_SCOPED_ENUMS
-# define BOOST_SCOPED_ENUM_START(name) struct name { enum enum_t
+# define BOOST_SCOPED_ENUM_START(name) struct name { enum enum_type
# define BOOST_SCOPED_ENUM_END };
-# define BOOST_SCOPED_ENUM(name) name::enum_t
+# define BOOST_SCOPED_ENUM(name) name::enum_type
#else
Modified: branches/release/libs/functional/hash/test/Jamfile.v2
==============================================================================
--- branches/release/libs/functional/hash/test/Jamfile.v2 (original)
+++ branches/release/libs/functional/hash/test/Jamfile.v2 2010-02-14 11:31:21 EST (Sun, 14 Feb 2010)
@@ -47,6 +47,7 @@
: <toolset>gcc:<define>_GLIBCXX_DEBUG
<toolset>darwin:<define>_GLIBCXX_DEBUG
: container_fwd_gcc_debug ]
+ [ run container_no_fwd_test.cpp ]
[ compile-fail hash_no_ext_fail_test.cpp ]
[ compile-fail namespace_fail_test.cpp ]
[ run hash_no_ext_macro_1.cpp ]