|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62596 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/concept boost/concept/detail boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/integer boost/interprocess boost/intrusive boost/iostreams boost/math boost/numeric/ublas boost/program_options boost/property_tree boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/tr1 boost/type_traits boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/array/doc libs/array/test libs/bimap libs/concept_check libs/config libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/range libs/range/doc libs/regex libs/regex/doc libs/serialization libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/tr1 libs/type_traits libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave more more/getting_started people status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/jam tools/quickbook tools/regression tools/release tools/wave wiki
From: jewillco_at_[hidden]
Date: 2010-06-08 15:31:14
Author: jewillco
Date: 2010-06-08 15:31:13 EDT (Tue, 08 Jun 2010)
New Revision: 62596
URL: http://svn.boost.org/trac/boost/changeset/62596
Log:
Merged r53751, r41955, r47793, r47794, r47797, r62595 from trunk; fixes #865
Added:
branches/release/boost/concept/detail/backward_compatibility.hpp
- copied unchanged from r53751, /trunk/boost/concept/detail/backward_compatibility.hpp
Properties modified:
branches/release/ (props changed)
branches/release/INSTALL (props changed)
branches/release/Jamroot (props changed)
branches/release/LICENSE_1_0.txt (props changed)
branches/release/boost/ (props changed)
branches/release/boost-build.jam (props changed)
branches/release/boost.css (props changed)
branches/release/boost.png (props changed)
branches/release/boost/algorithm/string/ (props changed)
branches/release/boost/archive/ (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/endian.hpp (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/property_tree/ (props changed)
branches/release/boost/python/ (props changed)
branches/release/boost/range/ (props changed)
branches/release/boost/regex/ (props changed)
branches/release/boost/serialization/ (props changed)
branches/release/boost/serialization/factory.hpp (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/boost/spirit/home/support/attributes.hpp (props changed)
branches/release/boost/statechart/ (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/thread/ (props changed)
branches/release/boost/thread.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/boost/utility/ (props changed)
branches/release/boost/utility/value_init.hpp (props changed)
branches/release/boost/uuid/ (props changed)
branches/release/boost/variant/ (props changed)
branches/release/boost/version.hpp (props changed)
branches/release/boost/wave/ (props changed)
branches/release/bootstrap.bat (props changed)
branches/release/bootstrap.sh (props changed)
branches/release/doc/ (props changed)
branches/release/index.htm (props changed)
branches/release/index.html (props changed)
branches/release/libs/ (props changed)
branches/release/libs/array/doc/array.xml (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/functional/hash/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/maintainers.txt (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
branches/release/libs/numeric/ublas/ (props changed)
branches/release/libs/numeric/ublas/doc/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/range/doc/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/regex/doc/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/signals/ (props changed)
branches/release/libs/signals2/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/classic/example/ (props changed)
branches/release/libs/spirit/doc/ (props changed)
branches/release/libs/spirit/example/ (props changed)
branches/release/libs/spirit/phoenix/ (props changed)
branches/release/libs/spirit/test/ (props changed)
branches/release/libs/spirit/test/qi/optional.cpp (props changed)
branches/release/libs/statechart/ (props changed)
branches/release/libs/static_assert/ (props changed)
branches/release/libs/system/ (props changed)
branches/release/libs/thread/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (props changed)
branches/release/libs/unordered/ (props changed)
branches/release/libs/utility/ (props changed)
branches/release/libs/utility/swap.html (props changed)
branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
branches/release/libs/utility/value_init.htm (props changed)
branches/release/libs/utility/value_init_test.cpp (props changed)
branches/release/libs/uuid/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/more/ (props changed)
branches/release/more/getting_started/ (props changed)
branches/release/people/ (props changed)
branches/release/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/tools/ (props changed)
branches/release/tools/bcp/ (props changed)
branches/release/tools/boostbook/ (props changed)
branches/release/tools/build/v2/ (props changed)
branches/release/tools/build/v2/tools/ (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/jam/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
branches/release/wiki/ (props changed)
Text files modified:
branches/release/boost/concept/detail/borland.hpp | 5 +++--
branches/release/boost/concept/detail/general.hpp | 21 +++++++++++++++------
branches/release/boost/concept/detail/has_constraints.hpp | 6 ++++--
branches/release/boost/concept/detail/msvc.hpp | 32 +++++++++++++++++++++++++++-----
branches/release/boost/concept/usage.hpp | 9 +++++----
branches/release/libs/concept_check/concept_check.htm | 2 +-
branches/release/libs/concept_check/stl_concept_check.cpp | 3 ++-
7 files changed, 57 insertions(+), 21 deletions(-)
Modified: branches/release/boost/concept/detail/borland.hpp
==============================================================================
--- branches/release/boost/concept/detail/borland.hpp (original)
+++ branches/release/boost/concept/detail/borland.hpp 2010-06-08 15:31:13 EDT (Tue, 08 Jun 2010)
@@ -5,8 +5,9 @@
# define BOOST_CONCEPT_DETAIL_BORLAND_DWA2006429_HPP
# include <boost/preprocessor/cat.hpp>
+# include <boost/concept/detail/backward_compatibility.hpp>
-namespace boost { namespace concept {
+namespace boost { namespace concepts {
template <class ModelFnPtr>
struct require;
@@ -21,7 +22,7 @@
enum \
{ \
BOOST_PP_CAT(boost_concept_check,__LINE__) = \
- boost::concept::require<ModelFnPtr>::instantiate \
+ boost::concepts::require<ModelFnPtr>::instantiate \
}
}} // namespace boost::concept
Modified: branches/release/boost/concept/detail/general.hpp
==============================================================================
--- branches/release/boost/concept/detail/general.hpp (original)
+++ branches/release/boost/concept/detail/general.hpp 2010-06-08 15:31:13 EDT (Tue, 08 Jun 2010)
@@ -5,6 +5,7 @@
# define BOOST_CONCEPT_DETAIL_GENERAL_DWA2006429_HPP
# include <boost/preprocessor/cat.hpp>
+# include <boost/concept/detail/backward_compatibility.hpp>
# ifdef BOOST_OLD_CONCEPT_SUPPORT
# include <boost/concept/detail/has_constraints.hpp>
@@ -13,7 +14,7 @@
// This implementation works on Comeau and GCC, all the way back to
// 2.95
-namespace boost { namespace concept {
+namespace boost { namespace concepts {
template <class ModelFn>
struct requirement_;
@@ -29,6 +30,14 @@
static void failed() { ((Model*)0)->~Model(); }
};
+struct failed {};
+
+template <class Model>
+struct requirement<failed ************ Model::************>
+{
+ static void failed() { ((Model*)0)->~Model(); }
+};
+
# ifdef BOOST_OLD_CONCEPT_SUPPORT
template <class Model>
@@ -40,9 +49,9 @@
template <class Model>
struct requirement_<void(*)(Model)>
: mpl::if_<
- concept::not_satisfied<Model>
+ concepts::not_satisfied<Model>
, constraint<Model>
- , requirement<Model>
+ , requirement<failed ************ Model::************>
>::type
{};
@@ -51,14 +60,14 @@
// For GCC-2.x, these can't have exactly the same name
template <class Model>
struct requirement_<void(*)(Model)>
- : requirement<Model>
+ : requirement<failed ************ Model::************>
{};
# endif
# define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
- typedef ::boost::concept::detail::instantiate< \
- &::boost::concept::requirement_<ModelFnPtr>::failed> \
+ typedef ::boost::concepts::detail::instantiate< \
+ &::boost::concepts::requirement_<ModelFnPtr>::failed> \
BOOST_PP_CAT(boost_concept_check,__LINE__)
}}
Modified: branches/release/boost/concept/detail/has_constraints.hpp
==============================================================================
--- branches/release/boost/concept/detail/has_constraints.hpp (original)
+++ branches/release/boost/concept/detail/has_constraints.hpp 2010-06-08 15:31:13 EDT (Tue, 08 Jun 2010)
@@ -6,7 +6,9 @@
# include <boost/mpl/bool.hpp>
# include <boost/detail/workaround.hpp>
-namespace boost { namespace concept {
+# include <boost/concept/detail/backward_compatibility.hpp>
+
+namespace boost { namespace concepts {
namespace detail
{
@@ -43,6 +45,6 @@
typedef mpl::bool_<value> type;
};
-}} // namespace boost::concept::detail
+}} // namespace boost::concepts::detail
#endif // BOOST_CONCEPT_DETAIL_HAS_CONSTRAINTS_DWA2006429_HPP
Modified: branches/release/boost/concept/detail/msvc.hpp
==============================================================================
--- branches/release/boost/concept/detail/msvc.hpp (original)
+++ branches/release/boost/concept/detail/msvc.hpp 2010-06-08 15:31:13 EDT (Tue, 08 Jun 2010)
@@ -5,6 +5,7 @@
# define BOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP
# include <boost/preprocessor/cat.hpp>
+# include <boost/concept/detail/backward_compatibility.hpp>
# ifdef BOOST_OLD_CONCEPT_SUPPORT
# include <boost/concept/detail/has_constraints.hpp>
@@ -12,7 +13,8 @@
# endif
-namespace boost { namespace concept {
+namespace boost { namespace concepts {
+
template <class Model>
struct check
@@ -22,7 +24,19 @@
x->~Model();
}
};
-
+
+# ifndef BOOST_NO_PARTIAL_SPECIALIZATION
+struct failed {};
+template <class Model>
+struct check<failed ************ Model::************>
+{
+ virtual void failed(Model* x)
+ {
+ x->~Model();
+ }
+};
+# endif
+
# ifdef BOOST_OLD_CONCEPT_SUPPORT
namespace detail
@@ -38,7 +52,11 @@
: mpl::if_c<
not_satisfied<Model>::value
, detail::constraint
+# ifndef BOOST_NO_PARTIAL_SPECIALIZATION
, check<Model>
+# else
+ , check<failed ************ Model::************>
+# endif
>::type
{};
@@ -46,7 +64,11 @@
template <class Model>
struct require
- : check<Model>
+# ifndef BOOST_NO_PARTIAL_SPECIALIZATION
+ : check<Model>
+# else
+ : check<failed ************ Model::************>
+# endif
{};
# endif
@@ -70,7 +92,7 @@
enum \
{ \
BOOST_PP_CAT(boost_concept_check,__LINE__) = \
- sizeof(::boost::concept::require<ModelFnPtr>) \
+ sizeof(::boost::concepts::require<ModelFnPtr>) \
}
# else // Not vc-7.1
@@ -83,7 +105,7 @@
enum \
{ \
BOOST_PP_CAT(boost_concept_check,__LINE__) = \
- sizeof(::boost::concept::require_((ModelFnPtr)0)) \
+ sizeof(::boost::concepts::require_((ModelFnPtr)0)) \
}
# endif
Modified: branches/release/boost/concept/usage.hpp
==============================================================================
--- branches/release/boost/concept/usage.hpp (original)
+++ branches/release/boost/concept/usage.hpp 2010-06-08 15:31:13 EDT (Tue, 08 Jun 2010)
@@ -6,8 +6,9 @@
# include <boost/concept/assert.hpp>
# include <boost/detail/workaround.hpp>
+# include <boost/concept/detail/backward_compatibility.hpp>
-namespace boost { namespace concept {
+namespace boost { namespace concepts {
# if BOOST_WORKAROUND(__GNUC__, == 2)
@@ -25,19 +26,19 @@
# define BOOST_CONCEPT_USAGE(model) \
model(); /* at least 2.96 and 3.4.3 both need this :( */ \
- BOOST_CONCEPT_ASSERT((boost::concept::usage_requirements<model>)); \
+ BOOST_CONCEPT_ASSERT((boost::concepts::usage_requirements<model>)); \
~model()
# else
# define BOOST_CONCEPT_USAGE(model) \
- BOOST_CONCEPT_ASSERT((boost::concept::usage_requirements<model>)); \
+ BOOST_CONCEPT_ASSERT((boost::concepts::usage_requirements<model>)); \
~model()
# endif
# endif
-}} // namespace boost::concept
+}} // namespace boost::concepts
#endif // BOOST_CONCEPT_USAGE_DWA2006919_HPP
Modified: branches/release/libs/concept_check/concept_check.htm
==============================================================================
--- branches/release/libs/concept_check/concept_check.htm (original)
+++ branches/release/libs/concept_check/concept_check.htm 2010-06-08 15:31:13 EDT (Tue, 08 Jun 2010)
@@ -250,7 +250,7 @@
boost/concept_check.hpp: In destructor ‘boost::LessThanComparable<TT>::~
LessThanComparable() [with TT = std::complex<float>]’:
boost/concept/detail/general.hpp:29: instantiated from ‘static void boost::
- concept::requirement<Model>::failed() [with Model = boost::
+ concepts::requirement<Model>::failed() [with Model = boost::
LessThanComparable<std::complex<float> >]’
boost/concept/requires.hpp:30: instantiated from ‘boost::_requires_<void
(*)(boost::LessThanComparable<std::complex<float> >)>’
Modified: branches/release/libs/concept_check/stl_concept_check.cpp
==============================================================================
--- branches/release/libs/concept_check/stl_concept_check.cpp (original)
+++ branches/release/libs/concept_check/stl_concept_check.cpp 2010-06-08 15:31:13 EDT (Tue, 08 Jun 2010)
@@ -47,7 +47,8 @@
function_requires< BackInsertionSequence<Vector> >();
#if !(defined(__GNUC__) && defined(BOOST_HIDE_EXPECTED_ERRORS))
-#if !(defined(__sgi) && defined(BOOST_HIDE_EXPECTED_ERRORS))
+#if !((defined(__sgi) || (defined(__DECCXX) && defined(_RWSTD_VER) && _RWSTD_VER <= 0x0203)) \
+ && defined(BOOST_HIDE_EXPECTED_ERRORS))
// old deque iterator missing n + iter operation
function_requires< Mutable_RandomAccessContainer<Deque> >();
#endif
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