Typed in place construction added

[SVN r20070]

test/Jamfile

@@ -41,5 +41,6 @@ DEPENDS all : test ;
     [ compile-fail libs/optional/test/optional_test_references_fail3.cpp ]
     [ compile-fail libs/optional/test/optional_test_references_fail4.cpp ]
     [ compile-fail libs/optional/test/optional_test_inplace_fail.cpp ]
+    [ compile-fail libs/optional/test/optional_test_inplace_fail2.cpp ]
   ;
 }

test/optional_test_inplace.cpp

@@ -20,6 +20,7 @@
 
 #include "boost/optional.hpp"
 #include "boost/utility/in_place_factory.hpp"
+#include "boost/utility/typed_in_place_factory.hpp"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
@@ -42,16 +43,24 @@ struct A
 
 int test_main( int, char* [] )
 {
-  A a(3.14,"pi");
+  double a0 = 3.14 ;
+  std::string a1("pi");
+
+  A a(a0,a1);
 
   boost::optional<A> opt1(a);
 
-  boost::optional<A> opt2 ( boost::in_place(3.14,"pi") ) ;
+  boost::optional<A> opt2 ( boost::in_place(a0,a1) ) ;
+
+  boost::optional<A> opt3 ( boost::in_place<A>(a0,a1) ) ;
 
   BOOST_CHECK( opt1 == opt2 ) ;
+  BOOST_CHECK( opt2 == opt2 ) ;
   BOOST_CHECK( *opt2 == a ) ;
 
   return 0;
 }
 
 
+
+

test/optional_test_inplace_fail2.cpp

@@ -0,0 +1,53 @@
+// (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// This material is provided "as is", with absolutely no warranty expressed
+// or implied. Any use is at your own risk.
+//
+// Permission to use or copy this software for any purpose is hereby granted
+// without fee, provided the above notices are retained on all copies.
+// Permission to modify the code and to distribute modified code is granted,
+// provided the above notices are retained, and a notice that the code was
+// modified is included with the above copyright notice.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#include<iostream>
+#include<stdexcept>
+#include<string>
+
+#define BOOST_ENABLE_ASSERT_HANDLER
+
+#include "boost/optional.hpp"
+#include "boost/utility/typed_in_place_factory.hpp"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "boost/test/minimal.hpp"
+
+#include "optional_test_common.cpp"
+
+struct A
+{
+  A ( double a0, std::string a1 ) : m_a0(a0), m_a1(a1) {}
+
+  friend bool operator == ( A const& x, A const& y )
+    { return x.m_a0 == y.m_a0 && x.m_a1 == y.m_a1 ; }
+
+  double      m_a0 ;
+  std::string m_a1 ;
+} ;
+
+int test_main( int, char* [] )
+{
+  // This must fail to compile.
+  // The first template argument to in_place<> is the target-type,
+  // not the first constructor parameter type. 
+  boost::optional<A> opt2 ( boost::in_place<int>(3.14,"pi") ) ;
+
+  return 0;
+}
+
+