boost.python: merging from trunk to release (gcc 4.4 -std=c++0x compatibility)

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit 471be524f461 · 2009-11-21T14:41:51.000Z
[SVN r57837]
diff --git a/src/object/function_doc_signature.cpp b/src/object/function_doc_signature.cpp
@@ -3,6 +3,9 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// boost::python::make_tuple below are for gcc 4.4 -std=c++0x compatibility
+// (Intel C++ 10 and 11 with -std=c++0x don't need the full qualification).
+
 #include <boost/python/converter/registrations.hpp>
 #include <boost/python/object/function_doc_signature.hpp>
 #include <boost/python/errors.hpp>
@@ -12,7 +15,6 @@
 
 #include <boost/python/detail/signature.hpp>
 
-
 #include <vector>
 
 namespace boost { namespace python { namespace objects {
@@ -228,7 +230,7 @@ namespace boost { namespace python { namespace objects {
         {
             return str(
                 "%s %s(%s%s%s%s)"
-                % make_tuple
+                % boost::python::make_tuple // workaround, see top
                 ( ret_type
                     , f->m_name
                     , str(",").join(formal_params.slice(0,arity-n_overloads))
@@ -239,7 +241,7 @@ namespace boost { namespace python { namespace objects {
         }else{
             return str(
                 "%s(%s%s%s%s) -> %s"
-                % make_tuple
+                % boost::python::make_tuple // workaround, see top
                 ( f->m_name
                     , str(",").join(formal_params.slice(0,arity-n_overloads))
                     , n_overloads ? (n_overloads!=arity?str(" [,"):str("[ ")) : str()
@@ -251,7 +253,7 @@ namespace boost { namespace python { namespace objects {
 
         return str(
             "%s %s(%s%s%s%s) %s"
-            % make_tuple
+            % boost::python::make_tuple // workaround, see top
             ( cpp_types?ret_type:str("")
                 , f->m_name
                 , str(",").join(formal_params.slice(0,arity-n_overloads))
diff --git a/test/pickle1.cpp b/test/pickle1.cpp
@@ -40,8 +40,7 @@ namespace boost_python_test {
     boost::python::tuple
     getinitargs(const world& w)
     {
-        using namespace boost::python;
-        return make_tuple(w.get_country());
+        return boost::python::make_tuple(w.get_country());
     }
   };
 
diff --git a/test/pickle2.cpp b/test/pickle2.cpp
@@ -52,16 +52,14 @@ namespace boost_python_test {
     boost::python::tuple
     getinitargs(const world& w)
     {
-        using namespace boost::python;
-        return make_tuple(w.get_country());
+        return boost::python::make_tuple(w.get_country());
     }
 
     static
     boost::python::tuple
     getstate(const world& w)
     {
-        using namespace boost::python;
-        return make_tuple(w.get_secret_number());
+        return boost::python::make_tuple(w.get_secret_number());
     }
 
     static
@@ -77,7 +75,7 @@ namespace boost_python_test {
               );
           throw_error_already_set();
         }
-        
+
         long number = extract<long>(state[0]);
         if (number != 42)
             w.set_secret_number(number);
diff --git a/test/pickle3.cpp b/test/pickle3.cpp
@@ -25,10 +25,6 @@
 #include <boost/python/extract.hpp>
 #include <boost/python/back_reference.hpp>
 
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
-# define make_tuple boost::python::make_tuple
-#endif 
-
 namespace boost_python_test {
 
   // A friendly class.
@@ -53,18 +49,18 @@ namespace boost_python_test {
     boost::python::tuple
     getinitargs(const world& w)
     {
-        using namespace boost::python;
-        return make_tuple(w.get_country());
+        return boost::python::make_tuple(w.get_country());
     }
 
     static
     boost::python::tuple
     getstate(boost::python::object w_obj)
     {
-        using namespace boost::python;
-        world const& w = extract<world const&>(w_obj)();
+        world const& w = boost::python::extract<world const&>(w_obj)();
 
-        return make_tuple(w_obj.attr("__dict__"), w.get_secret_number());
+        return boost::python::make_tuple(
+            w_obj.attr("__dict__"),
+            w.get_secret_number());
     }
 
     static
@@ -73,7 +69,7 @@ namespace boost_python_test {
     {
         using namespace boost::python;
         world& w = extract<world&>(w_obj)();
-        
+
         if (len(state) != 2)
         {
           PyErr_SetObject(PyExc_ValueError,
@@ -82,11 +78,11 @@ namespace boost_python_test {
               );
           throw_error_already_set();
         }
-        
+
         // restore the object's __dict__
         dict d = extract<dict>(w_obj.attr("__dict__"))();
         d.update(state[0]);
-        
+
         // restore the internal state of the C++ object
         long number = extract<long>(state[1]);
         if (number != 42)

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@ namespace boost_python_test {`
`40`	`40`	`boost::python::tuple`
`41`	`41`	`getinitargs(const world& w)`
`42`	`42`	`{`
`43`		`- using namespace boost::python;`
`44`		`- return make_tuple(w.get_country());`
	`43`	`+ return boost::python::make_tuple(w.get_country());`
`45`	`44`	`}`
`46`	`45`	`};`
`47`	`46`
Original file line number	Diff line number	Diff line change
`@@ -52,16 +52,14 @@ namespace boost_python_test {`
`52`	`52`	`boost::python::tuple`
`53`	`53`	`getinitargs(const world& w)`
`54`	`54`	`{`
`55`		`- using namespace boost::python;`
`56`		`- return make_tuple(w.get_country());`
	`55`	`+ return boost::python::make_tuple(w.get_country());`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`static`
`60`	`59`	`boost::python::tuple`
`61`	`60`	`getstate(const world& w)`
`62`	`61`	`{`
`63`		`- using namespace boost::python;`
`64`		`- return make_tuple(w.get_secret_number());`
	`62`	`+ return boost::python::make_tuple(w.get_secret_number());`
`65`	`63`	`}`
`66`	`64`
`67`	`65`	`static`
`@@ -77,7 +75,7 @@ namespace boost_python_test {`
`77`	`75`	`);`
`78`	`76`	`throw_error_already_set();`
`79`	`77`	`}`
`80`		`-`
	`78`	`+`
`81`	`79`	`long number = extract<long>(state[0]);`
`82`	`80`	`if (number != 42)`
`83`	`81`	`w.set_secret_number(number);`