Create branch for next serialization release

[SVN r38613]
This commit was manufactured by cvs2svn to create tag
2025-10-06 22:10:54 +02:00 · 2007-08-13 03:23:47 +00:00 · 2007-07-24 19:28:14 +00:00 · 2007-06-06 20:57:40 +00:00 · 2007-04-12 14:32:38 +00:00 · 2007-01-07 22:58:41 +00:00
23 changed files with 223 additions and 696 deletions
--- a/OptionalPointee.html
+++ b/OptionalPointee.html
@@ -145,20 +145,14 @@ objects are is implemented in <a href="../../boost/utility/compare_pointees.hpp"
 so direct usage of relational operators with the implied aliasing of shallow semantics
 -as with pointers- should not be used with generic code written for this concept.</p>

-<h3>Acknowledgements</h3>
-<p>Based on the original concept developed by Augustus Saunders.
-
 <br>
-</p>
 <HR>
 <TABLE>
 <TR valign=top>
 <TD nowrap>Copyright &copy 2003</TD><TD>
-<A HREF="mailto:fernando_cacciola@hotmail.com">Fernando Cacciola</A>
+<A HREF="mailto:fernando_cacciola@hotmail.com">Fernando Cacciola</A>,
+based on the original concept developed by Augustus Saunders.
 </TD></TR></TABLE>

-<p>Distributed under the Boost Software License, Version 1.0. See
-<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a></p>
-
 </BODY>
 </HTML>
--- a/assert.html
+++ b/assert.html
@@ -47,15 +47,9 @@ void assertion_failed(char const * expr, char const * function, char const * fil
 		<P>As is the case with <STRONG>&lt;cassert&gt;</STRONG>, <STRONG>&lt;boost/assert.hpp&gt;</STRONG>
 			can be included multiple times in a single translation unit. <STRONG>BOOST_ASSERT</STRONG>
 			will be redefined each time as specified above.</P>
-		<p><STRONG>&lt;boost/assert.hpp&gt;</STRONG> also defines the macro <STRONG>BOOST_VERIFY</STRONG>. 
-			It has exactly the same behavior as <STRONG>BOOST_ASSERT</STRONG>, except that 
-			the expression that is passed to <STRONG>BOOST_VERIFY</STRONG> is always 
-			evaluated. This is useful when the asserted expression has desirable side 
-			effects; it can also help suppress warnings about unused variables when the 
-			only use of the variable is inside an assertion.</p>
 		<p><br>
-			<small>Copyright <20> 2002, 2007 by Peter Dimov. Distributed under the Boost Software 
-				License, Version 1.0. See accompanying file <A href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-				or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>.</small></p>
+			<small>Copyright <20> 2002 by Peter Dimov. Distributed under the Boost Software License, Version 
+				1.0. See accompanying file <A href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</A> or 
+				copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>.</small></p>
 	</body>
 </html>
--- a/compressed_pair.htm
+++ b/compressed_pair.htm
@@ -3,7 +3,7 @@
      <title>Header </title>
      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
      <meta name="Template" content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
-      <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
+      <meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
      <boostcompressed_pair.hpp>
   </head>
   <body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080">
@@ -59,18 +59,17 @@ public:
         empty type, then assigning to that member will produce memory corruption, 
         unless the empty type has a "do nothing" assignment operator defined. This is 
         due to a bug in the way VC6 generates implicit assignment operators.</p>
-      <h3>Acknowledgements</h3>
+      <hr>
+      <p>Revised 08 May 2001</p>
+      <p><EFBFBD> Copyright boost.org 2000. Permission to copy, use, modify, sell and 
+         distribute this document is granted provided this copyright notice appears in 
+         all copies. This document is provided "as is" without express or implied 
+         warranty, and with no claim as to its suitability for any purpose.</p>
      <p>Based on contributions by Steve Cleary, Beman Dawes, Howard Hinnant and John 
         Maddock.</p>
      <p>Maintained by <a href="mailto:john@johnmaddock.co.uk">John Maddock</a>, the 
         latest version of this file can be found at <a href="http://www.boost.org">www.boost.org</a>, 
         and the boost discussion list at <a href="http://www.yahoogroups.com/list/boost">www.yahoogroups.com/list/boost</a>.</p>
-      <hr>
-      <p>Revised
-      <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B %Y" startspan -->07 November 2007<!--webbot bot="Timestamp" endspan i-checksum="40338" --></p>
-      <p><EFBFBD> Copyright Beman Dawes, 2000.</p>
-<p>Distributed under the Boost Software License, Version 1.0. See
-<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a></p>
-
+      <p>&nbsp;</p>
   </body>
-</html>
+</html>
--- a/in_place_factories.html
+++ b/in_place_factories.html
@@ -3,8 +3,9 @@
 <HTML>

 <HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252">
-<TITLE>In_place_factory Documentation</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<LINK REL="stylesheet" TYPE="text/css" HREF="../../boost.css">
+<TITLE>Header </TITLE>
 </HEAD>

 <BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000FF" VLINK="#800080">
@@ -76,7 +77,7 @@ object is likely to be temporary and serve no purpose besides being the source</
 </pre>
 <p>A solution to this problem is to support direct construction of the contained
 object right in the container's storage.<br>
-In this scheme, the user supplies the arguments for the X constructor
+In this shceme, the user supplies the arguments for the X constructor
 directly to the container:</p>
 <pre>struct C
 {
@@ -137,7 +138,7 @@ The following simplified example shows the basic idea. A complete example follow

 void foo()
 {
-  C c( in_place(123,"hello") ) ;
+  C c( in_place(123,"hello" ) ;
 }
 </pre>

--- a/include/boost/assert.hpp
+++ b/include/boost/assert.hpp
@@ -2,7 +2,6 @@
 //  boost/assert.hpp - BOOST_ASSERT(expr)
 //
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2007 Peter Dimov
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -36,15 +35,3 @@ void assertion_failed(char const * expr, char const * function, char const * fil
 # include <assert.h> // .h to support old libraries w/o <cassert> - effect is the same
 # define BOOST_ASSERT(expr) assert(expr)
 #endif
-
-#undef BOOST_VERIFY
-
-#if defined(BOOST_DISABLE_ASSERTS) || ( !defined(BOOST_ENABLE_ASSERT_HANDLER) && defined(NDEBUG) )
-
-# define BOOST_VERIFY(expr) ((void)(expr))
-
-#else
-
-# define BOOST_VERIFY(expr) BOOST_ASSERT(expr)
-
-#endif
--- a/include/boost/current_function.hpp
+++ b/include/boost/current_function.hpp
@@ -32,10 +32,6 @@ inline void current_function_helper()

 # define BOOST_CURRENT_FUNCTION __PRETTY_FUNCTION__

-#elif defined(__DMC__) && (__DMC__ >= 0x810)
-
-# define BOOST_CURRENT_FUNCTION __PRETTY_FUNCTION__
-
 #elif defined(__FUNCSIG__)

 # define BOOST_CURRENT_FUNCTION __FUNCSIG__
--- a/include/boost/utility/detail/in_place_factory_prefix.hpp
+++ b/include/boost/utility/detail/in_place_factory_prefix.hpp
@@ -1,5 +1,4 @@
 // Copyright (C) 2003, Fernando Luis Cacciola Carballal.
-// Copyright (C) 2007, Tobias Schwinger.
 //
 // Use, modification, and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,27 +9,25 @@
 // You are welcome to contact the author at:
 //  fernando_cacciola@hotmail.com
 //
-#ifndef BOOST_UTILITY_DETAIL_INPLACE_FACTORY_PREFIX_04APR2007_HPP
-#define BOOST_UTILITY_DETAIL_INPLACE_FACTORY_PREFIX_04APR2007_HPP
+#ifndef BOOST_UTILITY_DETAIL_INPLACE_FACTORY_PREFIX_25AGO2003_HPP
+#define BOOST_UTILITY_DETAIL_INPLACE_FACTORY_PREFIX_25AGO2003_HPP

-#include <new>
-#include <cstddef>
 #include <boost/config.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/iteration/iterate.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/arithmetic/inc.hpp>
+#include <boost/preprocessor/punctuation/paren.hpp>
+#include <boost/preprocessor/facilities/empty.hpp>

 #define BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_INIT(z,n,_) BOOST_PP_CAT(m_a,n) BOOST_PP_LPAREN() BOOST_PP_CAT(a,n) BOOST_PP_RPAREN()
 #define BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_DECL(z,n,_) BOOST_PP_CAT(A,n) const& BOOST_PP_CAT(m_a,n);
+#define BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_ARG(z,n,_)  BOOST_PP_CAT(m_a,n)

 #define BOOST_MAX_INPLACE_FACTORY_ARITY 10

-#undef BOOST_UTILITY_DETAIL_INPLACE_FACTORY_SUFFIX_04APR2007_HPP
+#undef BOOST_UTILITY_DETAIL_INPLACE_FACTORY_SUFFIX_25AGO2003_HPP

 #endif

--- a/include/boost/utility/detail/in_place_factory_suffix.hpp
+++ b/include/boost/utility/detail/in_place_factory_suffix.hpp
@@ -1,5 +1,4 @@
 // Copyright (C) 2003, Fernando Luis Cacciola Carballal.
-// Copyright (C) 2007, Tobias Schwinger.
 //
 // Use, modification, and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,14 +9,15 @@
 // You are welcome to contact the author at:
 //  fernando_cacciola@hotmail.com
 //
-#ifndef BOOST_UTILITY_DETAIL_INPLACE_FACTORY_SUFFIX_04APR2007_HPP
-#define BOOST_UTILITY_DETAIL_INPLACE_FACTORY_SUFFIX_04APR2007_HPP
+#ifndef BOOST_UTILITY_DETAIL_INPLACE_FACTORY_SUFFIX_25AGO2003_HPP
+#define BOOST_UTILITY_DETAIL_INPLACE_FACTORY_SUFFIX_25AGO2003_HPP

 #undef BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_INIT
 #undef BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_DECL
+#undef BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_ARG
 #undef BOOST_MAX_INPLACE_FACTORY_ARITY

-#undef BOOST_UTILITY_DETAIL_INPLACE_FACTORY_PREFIX_04APR2007_HPP
+#undef BOOST_UTILITY_DETAIL_INPLACE_FACTORY_PREFIX_25AGO2003_HPP

 #endif

--- a/include/boost/utility/detail/result_of_iterate.hpp
+++ b/include/boost/utility/detail/result_of_iterate.hpp
@@ -21,69 +21,66 @@
 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)>
-    : boost::detail::result_of_impl<F, F(BOOST_RESULT_OF_ARGS), (boost::detail::has_result_type<F>::value)> {};
+    : detail::result_of<F, F(BOOST_RESULT_OF_ARGS)> {};
 #endif

-#undef BOOST_RESULT_OF_ARGS
-
-#if BOOST_PP_ITERATION() >= 1 
-
 namespace detail {

 template<typename R,  typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
         BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of_impl<R (*)(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)), FArgs, false>
+struct result_of<R (*)(BOOST_RESULT_OF_ARGS), FArgs>
 {
  typedef R type;
 };

 template<typename R,  typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
         BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of_impl<R (&)(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)), FArgs, false>
+struct result_of<R (&)(BOOST_RESULT_OF_ARGS), FArgs>
 {
  typedef R type;
 };

-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+#undef BOOST_RESULT_OF_ARGS
+
+#if BOOST_PP_ITERATION() > 1 && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
 template<typename R, typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
         BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of_impl<R (T0::*)
+struct result_of<R (T0::*)
                     (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T)),
-                 FArgs, false>
+                 FArgs>
 {
  typedef R type;
 };

 template<typename R, typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
         BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of_impl<R (T0::*)
+struct result_of<R (T0::*)
                     (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T))
                     const,
-                 FArgs, false>
+                 FArgs>
 {
  typedef R type;
 };

 template<typename R, typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
         BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of_impl<R (T0::*)
+struct result_of<R (T0::*)
                     (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T))
                     volatile,
-                 FArgs, false>
+                 FArgs>
 {
  typedef R type;
 };

 template<typename R, typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
         BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of_impl<R (T0::*)
+struct result_of<R (T0::*)
                     (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T))
                     const volatile,
-                 FArgs, false>
+                 FArgs>
 {
  typedef R type;
 };
 #endif

 }
-#endif
--- a/include/boost/utility/in_place_factory.hpp
+++ b/include/boost/utility/in_place_factory.hpp
@@ -1,5 +1,4 @@
 // Copyright (C) 2003, Fernando Luis Cacciola Carballal.
-// Copyright (C) 2007, Tobias Schwinger.
 //
 // Use, modification, and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,79 +9,50 @@
 // You are welcome to contact the author at:
 //  fernando_cacciola@hotmail.com
 //
-#ifndef BOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
-#ifndef BOOST_PP_IS_ITERATING
+#ifndef BOOST_UTILITY_INPLACE_FACTORY_25AGO2003_HPP
+#define BOOST_UTILITY_INPLACE_FACTORY_25AGO2003_HPP

 #include <boost/utility/detail/in_place_factory_prefix.hpp>

+#include <boost/type.hpp>
+
 namespace boost {

 class in_place_factory_base {} ;

-#define  BOOST_PP_ITERATION_LIMITS (0, BOOST_MAX_INPLACE_FACTORY_ARITY)
-#define  BOOST_PP_FILENAME_1 <boost/utility/in_place_factory.hpp>
-#include BOOST_PP_ITERATE()
+#define BOOST_DEFINE_INPLACE_FACTORY_CLASS(z,n,_) \
+template< BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n),class A) > \
+class BOOST_PP_CAT(in_place_factory, BOOST_PP_INC(n) ) : public in_place_factory_base \
+{ \
+public: \
+\
+  BOOST_PP_CAT(in_place_factory, BOOST_PP_INC(n) ) ( BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_INC(n),A,const& a) ) \
+    : \
+    BOOST_PP_ENUM( BOOST_PP_INC(n), BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_INIT, _ ) \
+  {} \
+\
+  template<class T> \
+  void apply ( void* address BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T) ) const \
+  { \
+    new ( address ) T ( BOOST_PP_ENUM_PARAMS( BOOST_PP_INC(n), m_a ) ) ; \
+  } \
+\
+  BOOST_PP_REPEAT( BOOST_PP_INC(n), BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_DECL, _) \
+} ; \
+\
+template< BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n),class A) > \
+BOOST_PP_CAT(in_place_factory, BOOST_PP_INC(n) ) < BOOST_PP_ENUM_PARAMS( BOOST_PP_INC(n), A ) > \
+in_place ( BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_INC(n),A, const& a) ) \
+{ \
+  return BOOST_PP_CAT(in_place_factory, BOOST_PP_INC(n) ) < BOOST_PP_ENUM_PARAMS( BOOST_PP_INC(n), A ) > \
+           ( BOOST_PP_ENUM_PARAMS( BOOST_PP_INC(n), a ) ) ; \
+} ; \
+
+BOOST_PP_REPEAT( BOOST_MAX_INPLACE_FACTORY_ARITY, BOOST_DEFINE_INPLACE_FACTORY_CLASS, BOOST_PP_EMPTY() )

 } // namespace boost

 #include <boost/utility/detail/in_place_factory_suffix.hpp>

-#define BOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
-#else
-#define N BOOST_PP_ITERATION()
-
-#if N
-template< BOOST_PP_ENUM_PARAMS(N, class A) >
-#endif
-class BOOST_PP_CAT(in_place_factory,N)
-  : 
-  public in_place_factory_base
-{
-public:
-
-  explicit BOOST_PP_CAT(in_place_factory,N)
-      ( BOOST_PP_ENUM_BINARY_PARAMS(N,A,const& a) )
-#if N > 0
-    : BOOST_PP_ENUM(N, BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_INIT, _)
-#endif
-  {}
-
-  template<class T>
-  void* apply(void* address
-      BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) const
-  {
-    return new(address) T( BOOST_PP_ENUM_PARAMS(N, m_a) );
-  }
-
-  template<class T>
-  void* apply(void* address, std::size_t n
-      BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) const
-  {
-    for(char* next = address = this->BOOST_NESTED_TEMPLATE apply<T>(address);
-        !! --n;)
-      this->BOOST_NESTED_TEMPLATE apply<T>(next = next+sizeof(T));
-    return address; 
-  }
-
-  BOOST_PP_REPEAT(N, BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_DECL, _)
-};
-
-#if N > 0
-template< BOOST_PP_ENUM_PARAMS(N, class A) >
-inline BOOST_PP_CAT(in_place_factory,N)< BOOST_PP_ENUM_PARAMS(N, A) >
-in_place( BOOST_PP_ENUM_BINARY_PARAMS(N, A, const& a) )
-{
-  return BOOST_PP_CAT(in_place_factory,N)< BOOST_PP_ENUM_PARAMS(N, A) >
-      ( BOOST_PP_ENUM_PARAMS(N, a) );
-}
-#else
-inline in_place_factory0 in_place()
-{
-  return in_place_factory0();
-}
-#endif
-
-#undef N
-#endif
 #endif

--- a/include/boost/utility/result_of.hpp
+++ b/include/boost/utility/result_of.hpp
@@ -15,8 +15,6 @@
 #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>

 #ifndef BOOST_RESULT_OF_NUM_ARGS
 #  define BOOST_RESULT_OF_NUM_ARGS 10
@@ -31,48 +29,28 @@ 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_void_impl
-{
-  typedef void type;
-};
-
-template<typename R>
-struct result_of_void_impl<R (*)(void)>
-{
-  typedef R type;
-};
-
-template<typename R>
-struct result_of_void_impl<R (&)(void)>
-{
-  typedef R type;
-};
+template<typename F, typename FArgs, bool HasResultType> struct get_result_of;

 template<typename F, typename FArgs>
-struct result_of_impl<F, FArgs, true>
+struct get_result_of<F, FArgs, true>
 {
  typedef typename F::result_type type;
 };

-template<typename FArgs>
-struct is_function_with_no_args : mpl::false_ {};
+template<typename F, typename FArgs>
+struct get_result_of<F, FArgs, false>
+{
+  typedef typename F::template result<FArgs>::type type;
+};

 template<typename F>
-struct is_function_with_no_args<F(void)> : mpl::true_ {};
+struct get_result_of<F, F(void), false>
+{
+  typedef void type;
+};

 template<typename F, typename FArgs>
-struct result_of_nested_result : F::template result<FArgs>
-{};
-
-template<typename F, typename FArgs>
-struct result_of_impl<F, FArgs, false>
-  : mpl::if_<is_function_with_no_args<FArgs>,
-	     result_of_void_impl<F>,
-	     result_of_nested_result<F, FArgs> >::type
-{};
+struct result_of : get_result_of<F, FArgs, (has_result_type<F>::value)> {};

 } // end namespace detail

--- a/include/boost/utility/typed_in_place_factory.hpp
+++ b/include/boost/utility/typed_in_place_factory.hpp
@@ -1,5 +1,4 @@
 // Copyright (C) 2003, Fernando Luis Cacciola Carballal.
-// Copyright (C) 2007, Tobias Schwinger.
 //
 // Use, modification, and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,8 +9,8 @@
 // You are welcome to contact the author at:
 //  fernando_cacciola@hotmail.com
 //
-#ifndef BOOST_UTILITY_TYPED_INPLACE_FACTORY_04APR2007_HPP
-#ifndef BOOST_PP_IS_ITERATING
+#ifndef BOOST_UTILITY_TYPED_INPLACE_FACTORY_25AGO2003_HPP
+#define BOOST_UTILITY_TYPED_INPLACE_FACTORY_25AGO2003_HPP

 #include <boost/utility/detail/in_place_factory_prefix.hpp>

@@ -19,59 +18,40 @@ namespace boost {

 class typed_in_place_factory_base {} ;

-#define  BOOST_PP_ITERATION_LIMITS (0, BOOST_MAX_INPLACE_FACTORY_ARITY)
-#define  BOOST_PP_FILENAME_1 <boost/utility/typed_in_place_factory.hpp>
-#include BOOST_PP_ITERATE()
+#define BOOST_DEFINE_TYPED_INPLACE_FACTORY_CLASS(z,n,_) \
+template< class T, BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n),class A) > \
+class BOOST_PP_CAT(typed_in_place_factory, BOOST_PP_INC(n) ) : public typed_in_place_factory_base \
+{ \
+public: \
+\
+  typedef T value_type ; \
+\
+  BOOST_PP_CAT(typed_in_place_factory, BOOST_PP_INC(n) ) ( BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_INC(n),A,const& a) ) \
+    : \
+    BOOST_PP_ENUM( BOOST_PP_INC(n), BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_INIT, _ ) \
+  {} \
+\
+  void apply ( void* address ) const \
+  { \
+    new ( address ) T ( BOOST_PP_ENUM_PARAMS( BOOST_PP_INC(n), m_a ) ) ; \
+  } \
+\
+  BOOST_PP_REPEAT( BOOST_PP_INC(n), BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_DECL, _) \
+} ; \
+\
+template< class T, BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n),class A) > \
+BOOST_PP_CAT(typed_in_place_factory, BOOST_PP_INC(n) ) < T , BOOST_PP_ENUM_PARAMS( BOOST_PP_INC(n), A ) > \
+in_place ( BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_INC(n),A, const& a) ) \
+{ \
+  return BOOST_PP_CAT(typed_in_place_factory, BOOST_PP_INC(n) ) < T, BOOST_PP_ENUM_PARAMS( BOOST_PP_INC(n), A ) > \
+           ( BOOST_PP_ENUM_PARAMS( BOOST_PP_INC(n), a ) ) ; \
+} ; \
+
+BOOST_PP_REPEAT( BOOST_MAX_INPLACE_FACTORY_ARITY, BOOST_DEFINE_TYPED_INPLACE_FACTORY_CLASS, BOOST_PP_EMPTY() )

 } // namespace boost

 #include <boost/utility/detail/in_place_factory_suffix.hpp>

-#define BOOST_UTILITY_TYPED_INPLACE_FACTORY_04APR2007_HPP
-#else 
-#define N BOOST_PP_ITERATION()
-
-template< class T BOOST_PP_ENUM_TRAILING_PARAMS(N,class A) >
-class BOOST_PP_CAT(typed_in_place_factory,N) 
-  : 
-  public typed_in_place_factory_base
-{
-public:
-
-  typedef T value_type;
-
-  explicit BOOST_PP_CAT(typed_in_place_factory,N) 
-      ( BOOST_PP_ENUM_BINARY_PARAMS(N, A, const& a) )
-#if N > 0
-    : BOOST_PP_ENUM(N, BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_INIT, _)
-#endif
-  {}
-
-  void* apply (void* address) const
-  {
-    return new(address) T( BOOST_PP_ENUM_PARAMS(N, m_a) );
-  }
-
-  void* apply (void* address, std::size_t n) const
-  {
-    for(void* next = address = this->apply(address); !! --n;)
-      this->apply(next = static_cast<char *>(next) + sizeof(T));
-    return address; 
-  }
-
-  BOOST_PP_REPEAT(N, BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_DECL, _)
-};
-
-template< class T BOOST_PP_ENUM_TRAILING_PARAMS(N, class A) >
-inline BOOST_PP_CAT(typed_in_place_factory,N)<
-    T BOOST_PP_ENUM_TRAILING_PARAMS(N, A) >
-in_place( BOOST_PP_ENUM_BINARY_PARAMS(N, A, const& a) )
-{
-  return BOOST_PP_CAT(typed_in_place_factory,N)< 
-      T BOOST_PP_ENUM_TRAILING_PARAMS(N, A) >( BOOST_PP_ENUM_PARAMS(N, a) );
-}
-
-#undef N
-#endif
 #endif

--- a/include/boost/utility/value_init.hpp
+++ b/include/boost/utility/value_init.hpp
@@ -1,113 +1,63 @@
-// (C) Copyright 2002-2007, Fernando Luis Cacciola Carballal.
+// Copyright 2002, Fernando Luis Cacciola Carballal.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 // 21 Ago 2002 (Created) Fernando Cacciola
-// 07 Set 2007 (Worked around MSVC++ bug) Fernando Cacciola, Niels Dekker
-// 16 Nov 2007 (Refactoring: removed private base classes) Fernando Cacciola, Niels Dekker
-// 09 Dec 2007 (Worked around various compiler bugs) Fernando Cacciola, Niels Dekker
 //
 #ifndef BOOST_UTILITY_VALUE_INIT_21AGO2002_HPP
 #define BOOST_UTILITY_VALUE_INIT_21AGO2002_HPP

-// Note: The implementation of boost::value_initialized had to deal with the
-// fact that various compilers haven't fully implemented value-initialization:
-// Microsoft Feedback ID 100744 - Value-initialization in new-expression
-// Reported by Pavel Kuznetsov (MetaCommunications Engineering), 2005-07-28
-// https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=100744
-// GCC Bug 30111 - Value-initialization of POD base class doesn't initialize members
-// Reported by Jonathan Wakely, 2006-12-07 
-// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30111
-// GCC Bug 33916 - Default constructor fails to initialize array members
-// Reported by Michael Elizabeth Chastain, 2007-10-26
-// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33916
-// Borland Report 51854 - Value-initialization: POD struct should be zero-initialized
-// Reported by Niels Dekker (LKEB, Leiden University Medical Center), 2007-11-09
-// http://qc.codegear.com/wc/qcmain.aspx?d=51854
-// The constructor of boost::value_initialized<T> works around these issues, by
-// clearing the bytes of T, before constructing the T object it contains. 
-
-#include <boost/aligned_storage.hpp>
-#include <boost/detail/select_type.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/type_traits/cv_traits.hpp>
-#include <boost/type_traits/alignment_of.hpp>
-#include <cstring>
-#include <new>
+#include "boost/detail/select_type.hpp"
+#include "boost/type_traits/cv_traits.hpp"

 namespace boost {

+namespace vinit_detail {
+
 template<class T>
-class value_initialized
+class const_T_base
 {
-  private :
-    struct wrapper
-    {
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
-      typename
-#endif 
-      remove_const<T>::type data;
-    };
+  protected :

-    mutable
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
-      typename
-#endif
-      ::boost::aligned_storage<sizeof(wrapper), ::boost::alignment_of<wrapper>::value>::type x;
-
-  public :
-
-    value_initialized()
-    {
-      std::memset(&x, 0, sizeof(x));
-#ifdef BOOST_MSVC
-#pragma warning(push)
-#if _MSC_VER >= 1310
-// When using MSVC 7.1 or higher, the following placement new expression may trigger warning C4345:
-// "behavior change: an object of POD type constructed with an initializer of the form ()
-// will be default-initialized".  There is no need to worry about this, though.
-#pragma warning(disable: 4345)
-#endif
-#endif
-      new (&x) wrapper();
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-    }
-
-    value_initialized(value_initialized const & arg)
-    {
-      void const * const ptr = &(arg.x);
-      new (&x) wrapper( *static_cast<wrapper const *>(ptr) );
-    }
-
-    value_initialized & operator=(value_initialized const & arg)
-    {
-      T & this_data = this->data();
-      T const & arg_data = arg.data();
-      this_data = arg_data;
-      return *this;
-    }
-
-    ~value_initialized()
-    {
-      void * const ptr = &x; 
-      static_cast<wrapper *>(ptr)->wrapper::~wrapper();
-    }
-
-    T& data() const
-    {
-      void * const ptr = &x;
-      return static_cast<wrapper *>(ptr)->data;
-    }
-
-    operator T&() const { return this->data(); }
+   const_T_base() : x() {}

+   T x ;
 } ;

+template<class T>
+struct non_const_T_base
+{
+  protected :

+   non_const_T_base() : x() {}
+
+   mutable T x ;
+} ;
+
+template<class T>
+struct select_base
+{
+  typedef typename
+    boost::detail::if_true< ::boost::is_const<T>::value >
+      ::template then< const_T_base<T>, non_const_T_base<T> >::type type ;
+} ;
+
+} // namespace vinit_detail
+
+template<class T>
+class value_initialized : private vinit_detail::select_base<T>::type
+{
+  public :
+
+    value_initialized() {}
+
+    operator T&() const { return this->x ; }
+
+    T& data() const { return this->x ; }
+
+} ;

 template<class T>
 T const& get ( value_initialized<T> const& x )
@@ -124,3 +74,4 @@ T& get ( value_initialized<T>& x )


 #endif
+
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,7 +1,8 @@
-# Copyright David Abrahams 2003.
-
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
+# Copyright David Abrahams 2003. Permission to copy, use,
+# modify, sell and distribute this software is granted provided this
+# copyright notice appears in all copies. This software is provided
+# "as is" without express or implied warranty, and with no claim as
+# to its suitability for any purpose.

 # For more information, see http://www.boost.org/

@@ -32,6 +33,5 @@ test-suite utility
        [ compile-fail ../value_init_test_fail1.cpp ]
        [ compile-fail ../value_init_test_fail2.cpp ]
        [ compile-fail ../value_init_test_fail3.cpp ]
-        [ run ../verify_test.cpp ]
+        [ run none_test.cpp ]
    ;
-
--- a/test/none_test.cpp
+++ b/test/none_test.cpp
@@ -0,0 +1,22 @@
+// Copyright 2007 Fernando Luis Cacciola Carballal.  Use, modification, and distribution
+// are subject to the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or a copy at
+// http://www.boost.org/LICENSE_1_0.txt.)
+
+// See http://www.boost.org/libs/utility for documentation.
+
+// Boost test program for noost::none_t and boost::none
+
+// Test strategy contributed by Richard Smith
+
+#include <boost/optional/optional.hpp> // Test none.hpp is included with <optional.hpp>
+
+// Left undefined to cause a linker error if this overload is incorrectly selected.
+void verify_no_implicit_conversion_to_int ( int i ) ;
+
+void verify_no_implicit_conversion_to_int ( boost::optional<int> const& ) {}
+
+int main() 
+{
+  verify_no_implicit_conversion_to_int( boost::none );
+}
--- a/test/result_of_test.cpp
+++ b/test/result_of_test.cpp
@@ -24,24 +24,6 @@ struct int_result_type_and_float_result_of
  template<typename F> struct result { typedef float type; };
 };

-template<typename T>
-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; };
-};
-
-template<typename T>
-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; };
-};
-
 struct X {};

 int main()
@@ -50,13 +32,10 @@ int main()

  typedef int (*func_ptr)(float, double);
  typedef int (&func_ref)(float, double);
-  typedef int (*func_ptr_0)();
-  typedef int (&func_ref_0)();
  typedef int (X::*mem_func_ptr)(float);
  typedef int (X::*mem_func_ptr_c)(float) const;
  typedef int (X::*mem_func_ptr_v)(float) volatile;
  typedef int (X::*mem_func_ptr_cv)(float) const volatile;
-  typedef int (X::*mem_func_ptr_0)();

  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));
@@ -64,22 +43,11 @@ int main()
  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<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));
-  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)); 
-  BOOST_STATIC_ASSERT((is_same<result_of<func_ref_0()>::type, int>::value)); 
  BOOST_STATIC_ASSERT((is_same<result_of<mem_func_ptr(X,char)>::type, int>::value));
  BOOST_STATIC_ASSERT((is_same<result_of<mem_func_ptr_c(X,char)>::type, int>::value));
  BOOST_STATIC_ASSERT((is_same<result_of<mem_func_ptr_v(X,char)>::type, int>::value));
  BOOST_STATIC_ASSERT((is_same<result_of<mem_func_ptr_cv(X,char)>::type, int>::value));
-  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));
-
  return 0;
 }
--- a/utility.htm
+++ b/utility.htm
@@ -163,9 +163,9 @@ void f() {
                <code><em>N</em> &gt; 0</code> or <code>void</code>
                when <code><em>N</em> = 0</code>. For additional
                information about <code>result_of</code>, see the
-                C++ Library Technical Report, <a
-                href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf">N1836</a>,
-                or, for motivation and design rationale, the <code>result_of</code> <a
+                current draft of the C++ Library TR, <a
+                href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2004/n1647.pdf">N1647</a>,
+                or the <code>result_of</code> <a
                href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1454.html">proposal</a>.</p>

                <p>Class template <code>result_of</code> resides in
@@ -183,12 +183,12 @@ void f() {
 		<p>See <a href="base_from_member.html">separate documentation</a>.</p>
 		<hr>
 		<p>Revised&nbsp; <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan
-->07 November, 2007<!--webbot bot="Timestamp" endspan i-checksum="39369"
+-->02 May, 2004<!--webbot bot="Timestamp" endspan i-checksum="38582"
 -->
 		</p>
-		<p>&copy; Copyright Beman Dawes 1999-2003.</p>
-<p>Distributed under the Boost Software License, Version 1.0. See
-<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a></p>
-
+		<p>&copy; Copyright boost.org 1999-2003. Permission to copy, use, modify, sell and distribute 
+			this document is granted provided this copyright notice appears in all copies. 
+			This document is provided &quot;as is&quot; without express or implied 
+			warranty, and with no claim as to its suitability for any purpose.</p>
 	</body>
-</html>
+</html>
--- a/value_init.htm
+++ b/value_init.htm
@@ -197,23 +197,23 @@ the wrapped object is always performed with the <code>get()</code> idiom:</p>
     value_initialized was developed by Fernando Cacciola, with help and
 suggestions from David Abrahams and Darin Adler.<br>
 Special thanks to Bj<42>rn Karlsson who carefully edited and completed this documentation.
+<pre>&nbsp;</pre>
+                    
+<hr>          
+<p>Revised 19 September 2002</p>
+                   
+<p>&copy; Copyright boost.org 2002. Permission to copy, use, modify, sell 
+and distribute this document is granted provided this copyright notice  appears 
+in all copies. This document is provided "as is" without express or implied 
+warranty, and with no claim as to its suitability for any purpose.</p>
                   
 <p>Developed by <a href="mailto:fernando_cacciola@hotmail.com">Fernando Cacciola</a>,
     the latest version of this file can be found at <a
 href="http://www.boost.org">www.boost.org</a>, and the boost discussion list
 at <a href="http://www.yahoogroups.com/list/boost">www.yahoogroups.com/list/boost</a>.
     </p>
-                    
-<hr>          
-<p>Revised 19 September 2002</p>
-                   
-<p>&copy; Copyright Fernando Cacciola, 2002.</p>
-                   
-<p>Distributed under the Boost Software License, Version 1.0. See
-<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a></p>
-
 <br>
 <br>
    
 </body>
-</html>
+</html>
--- a/value_init_test.cpp
+++ b/value_init_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2002, Fernando Luis Cacciola Carballal.
+// (C) 2002, Fernando Luis Cacciola Carballal.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -8,12 +8,10 @@
 //
 // Initial: 21 Agu 2002

-#include <cstring>  // For memcmp.
 #include <iostream>
 #include <string>

 #include "boost/utility/value_init.hpp"
-#include <boost/shared_ptr.hpp>

 #ifdef __BORLANDC__
 #pragma hdrstop
@@ -62,132 +60,9 @@ struct NonPOD : NonPODBase
  std::string id ;
 } ;

-//
-// Sample aggregate POD struct type
-// Some compilers do not correctly value-initialize such a struct, for example:
-// Borland C++ Report #51854, "Value-initialization: POD struct should be zero-initialized "
-// http://qc.codegear.com/wc/qcmain.aspx?d=51854
-//
-struct AggregatePODStruct
-{
-  float f;
-  char  c;
-  int   i;
-};
-
-bool operator == ( AggregatePODStruct const& lhs, AggregatePODStruct const& rhs )
-{ return lhs.f == rhs.f && lhs.c == rhs.c && lhs.i == rhs.i ; }
-
-//
-// An aggregate struct that contains an std::string and an int.
-// Pavel Kuznetsov (MetaCommunications Engineering) used a struct like
-// this to reproduce the Microsoft Visual C++ compiler bug, reported as
-// Feedback ID 100744, "Value-initialization in new-expression"
-// https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=100744
-//
-struct StringAndInt
-{
-  std::string s;
-  int i;
-};
-
-bool operator == ( StringAndInt const& lhs, StringAndInt const& rhs )
-{ return lhs.s == rhs.s && lhs.i == rhs.i ; }
-
-
-//
-// A struct that has an explicit (user defined) destructor.
-// Some compilers do not correctly value-initialize such a struct, for example:
-// Microsoft Visual C++, Feedback ID 100744, "Value-initialization in new-expression"
-// https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=100744
-//
-struct StructWithDestructor
-{
-  int i;
-  ~StructWithDestructor() {}
-};
-
-bool operator == ( StructWithDestructor const& lhs, StructWithDestructor const& rhs )
-{ return lhs.i == rhs.i ; }
-
-
-//
-// A struct that has a virtual function.
-// Some compilers do not correctly value-initialize such a struct either, for example:
-// Microsoft Visual C++, Feedback ID 100744, "Value-initialization in new-expression"
-// https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=100744
-//
-struct StructWithVirtualFunction
-{
-  int i;
-  virtual void VirtualFunction(); 
-};
-
-void StructWithVirtualFunction::VirtualFunction()
-{
-}
-
-bool operator == ( StructWithVirtualFunction const& lhs, StructWithVirtualFunction const& rhs )
-{ return lhs.i == rhs.i ; }
-
-
-//
-// A struct that is derived from an aggregate POD struct.
-// Some compilers do not correctly value-initialize such a struct, for example:
-// GCC Bugzilla Bug 30111,  "Value-initialization of POD base class doesn't initialize members",
-// reported by Jonathan Wakely, http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30111
-//
-struct DerivedFromAggregatePODStruct : AggregatePODStruct
-{
-  DerivedFromAggregatePODStruct() : AggregatePODStruct() {}
-};
-
-//
-// A struct that wraps an aggregate POD struct as data member.
-//
-struct AggregatePODStructWrapper
-{
-  AggregatePODStructWrapper() : dataMember() {}
-  AggregatePODStruct dataMember;
-};
-
-bool operator == ( AggregatePODStructWrapper const& lhs, AggregatePODStructWrapper const& rhs )
-{ return lhs.dataMember == rhs.dataMember ; }
-
-typedef unsigned char ArrayOfBytes[256];
-
-
-//
-// A struct that allows testing whether the appropriate copy functions are called.
-//
-struct CopyFunctionCallTester
-{
-  bool is_copy_constructed;
-  bool is_assignment_called;
-
-  CopyFunctionCallTester()
-  : is_copy_constructed(false), is_assignment_called(false) {}
-
-  CopyFunctionCallTester(const CopyFunctionCallTester & )
-  : is_copy_constructed(true), is_assignment_called(false) {}
-
-  CopyFunctionCallTester & operator=(const CopyFunctionCallTester & )
-  {
-    is_assignment_called = true ;
-    return *this ;
-  }
-};
-
-
-//
-// This test function tests boost::value_initialized<T> for a specific type T.
-// The first argument (y) is assumed have the value of a value-initialized object.
-// Returns true on success.
-//
 template<class T>
-bool test ( T const& y, T const& z )
+void test ( T const& y, T const& z )
 {
-  const boost::unit_test::counter_t counter_before_test = boost::minimal_test::errors_counter();
  boost::value_initialized<T> x ;
  BOOST_CHECK ( y == x ) ;
  BOOST_CHECK ( y == boost::get(x) ) ;
@@ -202,9 +77,6 @@ bool test ( T const& y, T const& z )
  x_c_ref = z ;
  BOOST_CHECK ( x_c == z ) ;

-  boost::shared_ptr<boost::value_initialized<T> > ptr( new boost::value_initialized<T> );
-  BOOST_CHECK ( y == *ptr ) ;
-
 #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
  boost::value_initialized<T const> cx ;
  BOOST_CHECK ( y == cx ) ;
@@ -214,71 +86,14 @@ bool test ( T const& y, T const& z )
  BOOST_CHECK ( y == cx_c ) ;
  BOOST_CHECK ( y == boost::get(cx_c) ) ;
 #endif
-
-  return boost::minimal_test::errors_counter() == counter_before_test ;
 }

 int test_main(int, char **)
 {
-  BOOST_CHECK ( test( 0,1234 ) ) ;
-  BOOST_CHECK ( test( 0.0,12.34 ) ) ;
-  BOOST_CHECK ( test( POD(0,0,0.0), POD('a',1234,56.78) ) ) ;
-  BOOST_CHECK ( test( NonPOD( std::string() ), NonPOD( std::string("something") ) ) ) ;
-
-  NonPOD NonPOD_object( std::string("NonPOD_object") );
-  BOOST_CHECK ( test<NonPOD *>( 0, &NonPOD_object ) ) ;
-
-  AggregatePODStruct zeroInitializedAggregatePODStruct = { 0.0f, '\0', 0 };
-  AggregatePODStruct nonZeroInitializedAggregatePODStruct = { 1.25f, 'a', -1 };
-  BOOST_CHECK ( test(zeroInitializedAggregatePODStruct, nonZeroInitializedAggregatePODStruct) );
-
-  StringAndInt stringAndInt0;
-  StringAndInt stringAndInt1;
-  stringAndInt0.i = 0;
-  stringAndInt1.i = 1;
-  stringAndInt1.s = std::string("1");
-  BOOST_CHECK ( test(stringAndInt0, stringAndInt1) );
-
-  StructWithDestructor structWithDestructor0;
-  StructWithDestructor structWithDestructor1;
-  structWithDestructor0.i = 0;
-  structWithDestructor1.i = 1;
-  BOOST_CHECK ( test(structWithDestructor0, structWithDestructor1) );
-
-  StructWithVirtualFunction structWithVirtualFunction0;
-  StructWithVirtualFunction structWithVirtualFunction1;
-  structWithVirtualFunction0.i = 0;
-  structWithVirtualFunction1.i = 1;
-  BOOST_CHECK ( test(structWithVirtualFunction0, structWithVirtualFunction1) );
-
-  DerivedFromAggregatePODStruct derivedFromAggregatePODStruct0;
-  DerivedFromAggregatePODStruct derivedFromAggregatePODStruct1;
-  static_cast<AggregatePODStruct &>(derivedFromAggregatePODStruct0) = zeroInitializedAggregatePODStruct;
-  static_cast<AggregatePODStruct &>(derivedFromAggregatePODStruct1) = nonZeroInitializedAggregatePODStruct;
-  BOOST_CHECK ( test(derivedFromAggregatePODStruct0, derivedFromAggregatePODStruct1) );
-
-  AggregatePODStructWrapper aggregatePODStructWrapper0;
-  AggregatePODStructWrapper aggregatePODStructWrapper1;
-  aggregatePODStructWrapper0.dataMember = zeroInitializedAggregatePODStruct;
-  aggregatePODStructWrapper1.dataMember = nonZeroInitializedAggregatePODStruct;
-  BOOST_CHECK ( test(aggregatePODStructWrapper0, aggregatePODStructWrapper1) );
-
-  ArrayOfBytes zeroInitializedArrayOfBytes = { 0 };
-  boost::value_initialized<ArrayOfBytes> valueInitializedArrayOfBytes;
-  BOOST_CHECK (std::memcmp(get(valueInitializedArrayOfBytes), zeroInitializedArrayOfBytes, sizeof(ArrayOfBytes)) == 0);
-
-  boost::value_initialized<CopyFunctionCallTester> copyFunctionCallTester1;
-  BOOST_CHECK ( ! get(copyFunctionCallTester1).is_copy_constructed);
-  BOOST_CHECK ( ! get(copyFunctionCallTester1).is_assignment_called);
-
-  boost::value_initialized<CopyFunctionCallTester> copyFunctionCallTester2 = boost::value_initialized<CopyFunctionCallTester>(copyFunctionCallTester1);
-  BOOST_CHECK ( get(copyFunctionCallTester2).is_copy_constructed);
-  BOOST_CHECK ( ! get(copyFunctionCallTester2).is_assignment_called);
-
-  boost::value_initialized<CopyFunctionCallTester> copyFunctionCallTester3;
-  copyFunctionCallTester3 = boost::value_initialized<CopyFunctionCallTester>(copyFunctionCallTester1);
-  BOOST_CHECK ( ! get(copyFunctionCallTester3).is_copy_constructed);
-  BOOST_CHECK ( get(copyFunctionCallTester3).is_assignment_called);
+  test( 0,1234 ) ;
+  test( 0.0,12.34 ) ;
+  test( POD(0,0,0.0), POD('a',1234,56.78) ) ;
+  test( NonPOD( std::string() ), NonPOD( std::string("something") ) ) ;

  return 0;
 }
@@ -286,3 +101,7 @@ int test_main(int, char **)

 unsigned int expected_failures = 0;

+
+
+
+
--- a/value_init_test_fail1.cpp
+++ b/value_init_test_fail1.cpp
@@ -1,4 +1,4 @@
-// Copyright 2002, Fernando Luis Cacciola Carballal.
+// (C) 2002, Fernando Luis Cacciola Carballal.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
--- a/value_init_test_fail2.cpp
+++ b/value_init_test_fail2.cpp
@@ -1,4 +1,4 @@
-// Copyright 2002, Fernando Luis Cacciola Carballal.
+// (C) 2002, Fernando Luis Cacciola Carballal.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
--- a/value_init_test_fail3.cpp
+++ b/value_init_test_fail3.cpp
@@ -1,4 +1,4 @@
-// Copyright 2002, Fernando Luis Cacciola Carballal.
+// (C) 2002, Fernando Luis Cacciola Carballal.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
--- a/verify_test.cpp
+++ b/verify_test.cpp
@@ -1,126 +0,0 @@
-//
-//  verify_test.cpp - a test for BOOST_VERIFY
-//
-//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2007 Peter Dimov
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#include <boost/detail/lightweight_test.hpp>
-
-#include <boost/assert.hpp>
-
-int f( int & x )
-{
-    return ++x;
-}
-
-void test_default()
-{
-    int x = 1;
-
-    BOOST_VERIFY( 1 );
-    BOOST_VERIFY( x == 1 );
-    BOOST_VERIFY( ++x );
-    BOOST_VERIFY( f(x) );
-    BOOST_VERIFY( &x );
-
-    BOOST_TEST( x == 3 );
-}
-
-#define BOOST_DISABLE_ASSERTS
-#include <boost/assert.hpp>
-
-void test_disabled()
-{
-    int x = 1;
-
-    BOOST_VERIFY( 1 );
-    BOOST_VERIFY( x == 1 );
-    BOOST_VERIFY( ++x );
-    BOOST_VERIFY( f(x) );
-    BOOST_VERIFY( &x );
-
-    BOOST_TEST( x == 3 );
-
-    BOOST_VERIFY( 0 );
-    BOOST_VERIFY( !x );
-    BOOST_VERIFY( x == 0 );
-    BOOST_VERIFY( !++x );
-    BOOST_VERIFY( !f(x) );
-
-    BOOST_TEST( x == 5 );
-
-    void * p = 0;
-    BOOST_VERIFY( p );
-}
-
-#undef BOOST_DISABLE_ASSERTS
-
-#define BOOST_ENABLE_ASSERT_HANDLER
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <cstdio>
-
-int handler_invoked = 0;
-
-void boost::assertion_failed(char const * expr, char const * function, char const * file, long line)
-{
-#if !defined(BOOST_NO_STDC_NAMESPACE)
-    using std::printf;
-#endif
-
-    printf("Expression: %s\nFunction: %s\nFile: %s\nLine: %ld\n\n", expr, function, file, line);
-    ++handler_invoked;
-}
-
-struct X
-{
-    static bool f()
-    {
-        BOOST_VERIFY( 0 );
-        return false;
-    }
-};
-
-void test_handler()
-{
-    int x = 1;
-
-    BOOST_VERIFY( 1 );
-    BOOST_VERIFY( x == 1 );
-    BOOST_VERIFY( ++x );
-    BOOST_VERIFY( f(x) );
-    BOOST_VERIFY( &x );
-
-    BOOST_TEST( x == 3 );
-
-    BOOST_VERIFY( 0 );
-    BOOST_VERIFY( !x );
-    BOOST_VERIFY( x == 0 );
-    BOOST_VERIFY( !++x );
-    BOOST_VERIFY( !f(x) );
-
-    BOOST_TEST( x == 5 );
-
-    void * p = 0;
-    BOOST_VERIFY( p );
-
-    BOOST_VERIFY( X::f() );
-
-    BOOST_TEST( handler_invoked == 8 );
-}
-
-#undef BOOST_ENABLE_ASSERT_HANDLER
-
-int main()
-{
-    test_default();
-    test_disabled();
-    test_handler();
-
-    return boost::report_errors();
-}
Author	SHA1	Message	Date
Robert Ramey	07b172f5fb	Create branch for next serialization release [SVN r38613]	2007-08-13 03:23:47 +00:00
nobody	9ff18c2c96	This commit was manufactured by cvs2svn to create tag 'Version_1_34_1'. [SVN r38286]	2007-07-24 19:28:14 +00:00
Daniel Frey	d5ea07c737	Merged changes for ticket #979 from HEAD [SVN r37920]	2007-06-06 20:57:40 +00:00
Fernando Cacciola	aa0096bf42	Testsuite for none_t added. [SVN r37421]	2007-04-12 14:32:38 +00:00
Daniel James	005c2f3cc8	Fix a couple of links. [SVN r36656]	2007-01-07 22:58:41 +00:00
Andreas Huber	09f7aab52d	Merged L & C issue fixes & HTML conversions from trunk to branch. [SVN r36281]	2006-12-05 22:33:21 +00:00
Peter Dimov	30a40f9f76	Linked to current_function.html [SVN r36268]	2006-12-04 20:31:38 +00:00
Vladimir Prus	d9f8bae673	Merge from HEAD. Allow building of shared versions of some Boost.Test libraries. Adjust tests to use always use static linking to Boost.Test, since linking to the shared version requires test changes. Patch from Juergen Hunold. [SVN r35990]	2006-11-10 19:59:52 +00:00
Peter Dimov	3c7b409460	License/copyright edits [SVN r35958]	2006-11-09 20:34:33 +00:00
Beman Dawes	ee3551e8dc	Merged copyright and license addition [SVN r35907]	2006-11-07 19:27:00 +00:00
Rene Rivera	95da2e90de	Remove obsolete Boost.Build v1 files. [SVN r35880]	2006-11-06 17:10:46 +00:00
John Maddock	6dd93ab916	Removed unneeded semicolon. [SVN r35636]	2006-10-16 18:01:40 +00:00
Hartmut Kaiser	505d419a1b	Resolved an ambiguity. [SVN r35039]	2006-09-08 00:16:31 +00:00
Gennaro Prota	d968b5f5b9	boost guidelines (mainly from inspect tool: tabs, license reference text, etc.); more to do... [SVN r34753]	2006-07-27 11:48:49 +00:00
nobody	d809d4e832	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r33417]	2006-03-21 02:26:31 +00:00