Release 1.41.0

[SVN r57747]

CMakeLists.txt

@@ -1,31 +0,0 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    assert.hpp
-    call_traits.hpp
-    checked_delete.hpp
-    compressed_pair.hpp
-    current_function.hpp
-    operators.hpp
-    throw_exception.hpp
-    utility.hpp
-    utility
-)
-
-# Add a library target to the build system
-boost_library_project(
-  utility
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  DESCRIPTION  "Various small utilities for C++ programming."
-  MODULARIZED 
-  AUTHORS  "David Abrahams <dave -at- boostpro.com>"
-           "Brad King"
-           "Douglas Gregor <doug.gregor -at- gmail.com>"
-  #  MAINTAINERS 
-)
-
-

include/boost/exception.hpp

@@ -6,14 +6,8 @@
 #ifndef UUID_1D94A7C6054E11DB9804B622A1EF5492
 #define UUID_1D94A7C6054E11DB9804B622A1EF5492
 
-#include <boost/exception/diagnostic_information.hpp>
-#include <boost/exception/error_info.hpp>
-#include <boost/exception/exception.hpp>
-#include <boost/exception/get_error_info.hpp>
-#include <boost/exception/info.hpp>
-#include <boost/exception/info_tuple.hpp>
-#ifndef BOOST_NO_EXCEPTIONS
-#include <boost/exception_ptr.hpp>
-#endif
+//The header <boost/exception.hpp> has been deprecated.
+//Please #include <boost/exception/all.hpp> instead.
+#include <boost/exception/all.hpp>
 
 #endif

include/boost/utility/detail/result_of_iterate.hpp

@@ -10,47 +10,6 @@
 # error Boost result_of - do not include this file!
 #endif
 
-#if defined(BOOST_HAS_DECLTYPE)
-
-// As of N2588, C++0x result_of only supports function call
-// expressions of the form f(x). This precludes support for member
-// function pointers, which are invoked with expressions of the form
-// o->*f(x). This implementation supports both.
-template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
-         BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T))>
-    : mpl::if_<
-          mpl::or_< is_pointer<F>, is_member_function_pointer<F> >
-        , detail::result_of_impl<
-            typename remove_cv<F>::type, 
-            typename remove_cv<F>::type(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)), false
-          >
-        , detail::result_of_decltype_impl<
-              F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T))
-          >
-      >::type
-{};
-
-namespace detail {
-
-# define BOOST_RESULT_OF_STATIC_MEMBERS(z, n, _) \
-     static T ## n t ## n; \
-  /**/
-
-template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
-         BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-class result_of_decltype_impl<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T))>
-{
-  static F f;
-  BOOST_PP_REPEAT(BOOST_PP_ITERATION(), BOOST_RESULT_OF_STATIC_MEMBERS, _)
-public:
-  typedef decltype(f(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),t))) type;
-};
-
-} // namespace detail 
-
-#else // defined(BOOST_HAS_DECLTYPE)
-
 // CWPro8 requires an argument in a function type specialization
 #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3002)) && BOOST_PP_ITERATION() == 0
 # define BOOST_RESULT_OF_ARGS void
@@ -62,22 +21,11 @@ public:
 template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
          BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
 struct result_of<F(BOOST_RESULT_OF_ARGS)>
-    : mpl::if_<
-          mpl::or_< is_pointer<F>, is_member_function_pointer<F> >
-        , boost::detail::result_of_impl<
-            typename remove_cv<F>::type, 
-            typename remove_cv<F>::type(BOOST_RESULT_OF_ARGS), 
-            (boost::detail::has_result_type<F>::value)>
-        , boost::detail::result_of_impl<
-            F,
-            F(BOOST_RESULT_OF_ARGS), 
-            (boost::detail::has_result_type<F>::value)> >::type { };
+    : boost::detail::result_of_impl<F, F(BOOST_RESULT_OF_ARGS), (boost::detail::has_result_type<F>::value)> {};
 #endif
 
 #undef BOOST_RESULT_OF_ARGS
 
-#endif // defined(BOOST_HAS_DECLTYPE)
-
 #if BOOST_PP_ITERATION() >= 1 
 
 namespace detail {

include/boost/utility/result_of.hpp

@@ -10,18 +10,13 @@
 #define BOOST_RESULT_OF_HPP
 
 #include <boost/config.hpp>
-#include <boost/preprocessor/iteration/iterate.hpp> 
-#include <boost/preprocessor/punctuation/comma_if.hpp> 
-#include <boost/preprocessor/repetition/enum_params.hpp> 
-#include <boost/preprocessor/repetition/enum_shifted_params.hpp> 
+#include <boost/type_traits/ice.hpp>
+#include <boost/type.hpp>
+#include <boost/preprocessor.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/mpl/has_xxx.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/type_traits/is_pointer.hpp>
-#include <boost/type_traits/is_member_function_pointer.hpp>
-#include <boost/type_traits/remove_cv.hpp>
 
 #ifndef BOOST_RESULT_OF_NUM_ARGS
 #  define BOOST_RESULT_OF_NUM_ARGS 10
@@ -37,7 +32,6 @@ namespace detail {
 BOOST_MPL_HAS_XXX_TRAIT_DEF(result_type)
 
 template<typename F, typename FArgs, bool HasResultType> struct result_of_impl;
-template<typename F> struct result_of_decltype_impl;
 
 template<typename F>
 struct result_of_void_impl
@@ -57,11 +51,6 @@ struct result_of_void_impl<R (&)(void)>
   typedef R type;
 };
 
-// Determine the return type of a function pointer or pointer to member.
-template<typename F, typename FArgs>
-struct result_of_pointer
-  : result_of_impl<typename remove_cv<F>::type, FArgs, false> { };
-
 template<typename F, typename FArgs>
 struct result_of_impl<F, FArgs, true>
 {

include/boost/utility/value_init.hpp

@@ -114,6 +114,8 @@ class value_initialized
 
 
 
+
+
 template<class T>
 T const& get ( value_initialized<T> const& x )
 {

module.cmake

@@ -1 +0,0 @@
-boost_module(utility DEPENDS iterator exception detail )

ref_test.cpp

@@ -68,54 +68,11 @@ struct ref_wrapper
     }
 };
 
-struct copy_counter {
-  static int count_;
-  copy_counter(copy_counter const& other) {
-    ++count_;
-  }
-  copy_counter() {}
-  static void reset() { count_ = 0; }
-  static int count() { return copy_counter::count_;  }
-};
-
-int copy_counter::count_ = 0;
-
 } // namespace unnamed
 
-template <class T>
-void do_unwrap(T t) {
-
-  /* typename unwrap_reference<T>::type& lt = */
-  unwrap_ref(t);
-
-}
-
-void unwrap_test() {
-
-  int i = 3;
-  const int ci = 2;
-
-  do_unwrap(i);
-  do_unwrap(ci);
-  do_unwrap(ref(i));
-  do_unwrap(cref(ci));
-  do_unwrap(ref(ci));
-
-  copy_counter cc;
-  BOOST_CHECK(cc.count() == 0);
-
-  do_unwrap(cc);
-  do_unwrap(ref(cc));
-  do_unwrap(cref(cc));
-
-  BOOST_CHECK(cc.count() == 1);
-  BOOST_CHECK(unwrap_ref(ref(cc)).count() == 1); 
-}
-
 int test_main(int, char * [])
 {
     ref_wrapper<int>::test(1);
     ref_wrapper<int const>::test(1);
-    unwrap_test();
     return 0;
 }

swap.html

@@ -7,7 +7,11 @@
    </head>
   <body>
     <!-- Page header -->
+    <h2>
     <img src="../../boost.png" alt="C++ Boost" align="middle" width="277" height="86"/>
+      Header &lt;<a href="../../boost/swap.hpp">boost/swap.hpp</a>&gt;
+    </h2>
+
     <h1>Swap</h1>
     
     <p>
@@ -84,9 +88,9 @@
 
     <!-- Copyright info -->    
     <hr/>
-    <p>Revised: 15 November 2008</p>
+    <p>Revised: 08 September 2009</p>
     <p>
-      Copyright 2007, 2008 Joseph Gauterin. Use, modification, and distribution are subject to the Boost Software License, Version 1.0.
+      Copyright 2007 - 2009 Joseph Gauterin. Use, modification, and distribution are subject to the Boost Software License, Version 1.0.
       (See accompanying file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or a copy at &lt;<a href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>&gt;.)
     </p>
     

test/CMakeLists.txt

@@ -1,38 +0,0 @@
-boost_additional_test_dependencies(utility BOOST_DEPENDS test)
-
-boost_test_run(addressof_test ../addressof_test.cpp)
-boost_test_run(assert_test ../assert_test.cpp)
-boost_test_run(base_from_member_test ../base_from_member_test.cpp)
-boost_test_run(binary_search_test ../binary_search_test.cpp)
-boost_test_run(call_traits_test ../call_traits_test.cpp ARGS -u)
-boost_test_compile_fail(checked_delete_test ../checked_delete_test.cpp)
-boost_test_run(compressed_pair_test 
-  ../compressed_pair_test 
-  DEPENDS boost_test_exec_monitor)
-boost_test_run(current_function_test ../current_function_test.cpp)
-boost_test_run(iterators_test 
-  ../iterators_test.cpp 
-  DEPENDS boost_test_exec_monitor)
-boost_test_run(next_prior_test DEPENDS boost_test_exec_monitor)
-boost_test_compile_fail(noncopyable_test ../noncopyable_test.cpp)
-boost_test_run(numeric_traits_test ../numeric_traits_test.cpp)
-if (${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
-boost_test_compile_fail("operators_test_compilerbug")
-elseif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
-boost_test_run(operators_test 
-  ../operators_test.cpp
-  DEPENDS boost_test_exec_monitor)
-endif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
-boost_test_compile(ref_ct_test ../ref_ct_test.cpp)
-boost_test_run(ref_test 
-  ../ref_test.cpp
-  DEPENDS boost_test_exec_monitor)
-boost_test_compile(result_of_test)
-boost_test_run(shared_iterator_test ../shared_iterator_test.cpp)
-boost_test_run(value_init_test ../value_init_test.cpp)
-boost_test_compile_fail(value_init_test_fail1 
-  ../value_init_test_fail1.cpp)
-boost_test_compile_fail(value_init_test_fail2
-  ../value_init_test_fail2.cpp)
-boost_test_compile_fail(value_init_test_fail3
-  ../value_init_test_fail3.cpp)

test/result_of_test.cpp

@@ -11,101 +11,35 @@
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-struct int_result_type
-{
-  typedef int result_type;
-  result_type operator()(float);
-};
+struct int_result_type { typedef int result_type; };
 
 struct int_result_of
 {
   template<typename F> struct result { typedef int type; };
-  result<int_result_of(double)>::type operator()(double);
-  result<const int_result_of(double)>::type operator()(double) const;
-  result<int_result_of()>::type operator()();
-  result<volatile int_result_of()>::type operator()() volatile;
 };
 
-struct int_result_type_and_float_result_of_and_char_return
+struct int_result_type_and_float_result_of
 {
   typedef int result_type;
   template<typename F> struct result { typedef float type; };
-  char operator()(char);
 };
 
 template<typename T>
-struct int_result_type_template
-{
-  typedef int result_type;
-  result_type operator()(float);
-};
+struct int_result_type_template { typedef int result_type; };
 
 template<typename T>
 struct int_result_of_template
 {
   template<typename F> struct result;
   template<typename This, typename That> struct result<This(That)> { typedef int type; };
-  typename result<int_result_of_template<T>(double)>::type operator()(double);
-  typename result<const int_result_of_template<T>(double)>::type operator()(double) const;
-  typename result<int_result_of_template<T>(double)>::type operator()();
-  typename result<volatile int_result_of_template<T>(double)>::type operator()() volatile;
 };
 
 template<typename T>
-struct int_result_type_and_float_result_of_and_char_return_template
+struct int_result_type_and_float_result_of_template
 {
   typedef int result_type;
   template<typename F> struct result;
   template<typename This, typename That> struct result<This(That)> { typedef float type; };
-  char operator()(char);
-};
-
-struct result_of_member_function_template
-{
-  template<typename F> struct result;
-
-  template<typename This, typename That> struct result<This(That)> { typedef That type; };
-  template<class T> typename result<result_of_member_function_template(T)>::type operator()(T);
-
-  template<typename This, typename That> struct result<const This(That)> { typedef const That type; };
-  template<class T> typename result<const result_of_member_function_template(T)>::type operator()(T) const;
-
-  template<typename This, typename That> struct result<volatile This(That)> { typedef volatile That type; };
-  template<class T> typename result<volatile result_of_member_function_template(T)>::type operator()(T) volatile;
-
-  template<typename This, typename That> struct result<const volatile This(That)> { typedef const volatile That type; };
-  template<class T> typename result<const volatile result_of_member_function_template(T)>::type operator()(T) const volatile;
-
-  template<typename This, typename That> struct result<This(That &, That)> { typedef That & type; };
-  template<class T> typename result<result_of_member_function_template(T &, T)>::type operator()(T &, T);
-
-  template<typename This, typename That> struct result<This(That const &, That)> { typedef That const & type; };
-  template<class T> typename result<result_of_member_function_template(T const &, T)>::type operator()(T const &, T);
-
-  template<typename This, typename That> struct result<This(That volatile &, That)> { typedef That volatile & type; };
-  template<class T> typename result<result_of_member_function_template(T volatile &, T)>::type operator()(T volatile &, T);
-
-  template<typename This, typename That> struct result<This(That const volatile &, That)> { typedef That const volatile & type; };
-  template<class T> typename result<result_of_member_function_template(T const volatile &, T)>::type operator()(T const volatile &, T);
-};
-
-struct no_result_type_or_result_of
-{
-  int operator()(double);
-  short operator()(double) const;
-  unsigned int operator()();
-  unsigned short operator()() volatile;
-  const unsigned short operator()() const volatile;
-};
-
-template<typename T>
-struct no_result_type_or_result_of_template
-{
-  int operator()(double);
-  short operator()(double) const;
-  unsigned int operator()();
-  unsigned short operator()() volatile;
-  const unsigned short operator()() const volatile;
 };
 
 struct X {};
@@ -126,37 +60,16 @@ int main()
 
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_type(float)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_of(double)>::type, int>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_of(void)>::type, void>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<const int_result_of(double)>::type, int>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of(void)>::type, void>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of(char)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_template<void>(float)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_of_template<void>(double)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<const int_result_of_template<void>(double)>::type, int>::value));
-
-  // Prior to decltype, result_of could not deduce the return type
-  // nullary function objects unless they exposed a result_type.
-#if defined(BOOST_HAS_DECLTYPE)
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_of(void)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of(void)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_of_template<void>(void)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of_template<void>(void)>::type, int>::value));
-#else
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_of(void)>::type, void>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of(void)>::type, void>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_of_template<void>(void)>::type, void>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<const int_result_of_template<void>(double)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of_template<void>(void)>::type, void>::value));
-#endif
-
-  // Prior to decltype, result_of ignored a nested result<> if
-  // result_type was defined. After decltype, result_of deduces the
-  // actual return type of the function object, ignoring both
-  // result<> and result_type.
-#if defined(BOOST_HAS_DECLTYPE)
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return(char)>::type, char>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return_template<void>(char)>::type, char>::value));
-#else
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return(char)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return_template<void>(char)>::type, int>::value));
-#endif
-
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_template<void>(char)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<func_ptr(char, float)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<func_ref(char, float)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<func_ptr_0()>::type, int>::value)); 
@@ -168,31 +81,5 @@ int main()
   BOOST_STATIC_ASSERT((is_same<result_of<mem_func_ptr_0(X)>::type, int>::value)); 
   BOOST_STATIC_ASSERT((is_same<result_of<func_ptr(void)>::type, int>::value));
 
-  BOOST_STATIC_ASSERT((is_same<result_of<result_of_member_function_template(double)>::type, double>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<const result_of_member_function_template(double)>::type, const double>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<volatile result_of_member_function_template(double)>::type, volatile double>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<const volatile result_of_member_function_template(double)>::type, const volatile double>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<result_of_member_function_template(int &, int)>::type, int &>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<result_of_member_function_template(int const &, int)>::type, int const &>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<result_of_member_function_template(int volatile &, int)>::type, int volatile &>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<result_of_member_function_template(int const volatile &, int)>::type, int const volatile &>::value));
-
-  typedef int (*pf_t)(int);
-  BOOST_STATIC_ASSERT((is_same<result_of<pf_t(int)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<pf_t const(int)>::type,int>::value));
-
-#if defined(BOOST_HAS_DECLTYPE)
-  BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result_of(double)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result_of(void)>::type, unsigned int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<const no_result_type_or_result_of(double)>::type, short>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<volatile no_result_type_or_result_of(void)>::type, unsigned short>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<const volatile no_result_type_or_result_of(void)>::type, const unsigned short>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result_of_template<void>(double)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result_of_template<void>(void)>::type, unsigned int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<const no_result_type_or_result_of_template<void>(double)>::type, short>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<volatile no_result_type_or_result_of_template<void>(void)>::type, unsigned short>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<const volatile no_result_type_or_result_of_template<void>(void)>::type, const unsigned short>::value));
-#endif
-
   return 0;
 }

utility.htm

@@ -154,13 +154,11 @@ void f() {
                 ...,t<em>N</em>)</code>. The implementation permits
                 the type <code>F</code> to be a function pointer,
                 function reference, member function pointer, or class
-                type.</p> <p>If your compiler does not support
-                <code>decltype</code>, then when <code>F</code> is a
-                class type with a member type <code>result_type</code>,
+                type. When <code>F</code> is a class type with a
+                member type <code>result_type</code>,
                 <code>result_of&lt;F(T1, T2, ...,
                 T<em>N</em>)&gt;</code> is
-                <code>F::result_type</code>. When <code>F</code>
-                does not contain <code>result_type</code>, 
+                <code>F::result_type</code>. Otherwise,
                 <code>result_of&lt;F(T1, T2, ...,
                 T<em>N</em>)&gt;</code> is <code>F::result&lt;F(T1,
                 T2, ..., T<em>N</em>)&gt;::type</code> when

value_init.htm

@@ -313,7 +313,7 @@ non-member    function <code>get()</code>:  </p>
                     
 <h3>Warning:</h3>
                    
-<p>The <code>value_initialized</code> implementation of Boost version 1.38.0 and older
+<p>The <code>value_initialized</code> implementation of Boost version 1.40.0 and older
 allowed <i>non-const</i> access to the wrapped object, from a constant wrapper,
 both by its conversion operator and its <code>data()</code> member function. For example:</p>
                    
@@ -407,7 +407,7 @@ for Boost release version 1.35 (2008), offering a workaround to various compiler
      </p>
                     
 <hr>          
-<p>Revised 20 February 2009</p>
+<p>Revised 03 October 2009</p>
                    
 <p>&copy; Copyright Fernando Cacciola, 2002, 2009.</p>
                    
@@ -418,4 +418,4 @@ for Boost release version 1.35 (2008), offering a workaround to various compiler
  <br>
     
 </body>
-</html>
+</html>