Update of /cvsroot/boost/boost/boost/python
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22646/boost/python
Modified Files:
Tag: RC_1_34_0
numeric.hpp make_constructor.hpp docstring_options.hpp
Log Message:
Correct class/function mismatches for MSVC and bring across
documentation tweaks from HEAD.
Index: numeric.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/python/numeric.hpp,v
retrieving revision 1.7.12.1
retrieving revision 1.7.12.2
diff -u -d -r1.7.12.1 -r1.7.12.2
--- numeric.hpp 9 Oct 2006 04:03:58 -0000 1.7.12.1
+++ numeric.hpp 13 Dec 2006 15:08:26 -0000 1.7.12.2
@@ -17,7 +17,7 @@
namespace boost { namespace python { namespace numeric {
-struct array;
+class array;
namespace aux
{
Index: make_constructor.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/python/make_constructor.hpp,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -u -d -r1.5 -r1.5.12.1
--- make_constructor.hpp 20 Aug 2004 11:09:16 -0000 1.5
+++ make_constructor.hpp 13 Dec 2006 15:08:26 -0000 1.5.12.1
@@ -103,12 +103,14 @@
// If the BasePolicy_ supplied a result converter it would be
// ignored; issue an error if it's not the default.
- BOOST_STATIC_ASSERT((
- is_same<
+ BOOST_MPL_ASSERT_MSG(
+ (is_same<
typename BasePolicy_::result_converter
, default_result_converter
- >::value
- ));
+ >::value)
+ ,
MAKE_CONSTRUCTOR_SUPPLIES_ITS_OWN_RESULT_CONVERTER_THAT_WOULD_OVERRIDE_YOURS
+ , (typename BasePolicy_::result_converter)
+ );
typedef constructor_result_converter result_converter;
typedef offset_args<typename BasePolicy_::argument_package, mpl::int_<1>
> argument_package;
Index: docstring_options.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/python/docstring_options.hpp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- docstring_options.hpp 24 Jan 2006 17:55:56 -0000 1.2
+++ docstring_options.hpp 13 Dec 2006 15:08:26 -0000 1.2.4.1
@@ -62,7 +62,7 @@
show_signatures_ = true;
}
- friend class objects::function;
+ friend struct objects::function;
private:
static volatile bool show_user_defined_;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
