Mercurial > pytave

diff octave_to_python.cc @ 406:16e79a1e96b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate all remaining uses of "using namespace" * octave_to_python.cc, pycall.cc, pyeval.cc, pyexec.cc, python_to_octave.cc: Eliminate all remaining uses of "using namespace", use fully qualified class and function names from Boost.
author Mike Miller <mtmiller@octave.org>
date Mon, 01 May 2017 08:41:01 -0700
parents 6c316b5f30f7
children
line wrap: on
line diff
--- a/octave_to_python.cc	Sat Apr 29 15:43:42 2017 -0700
+++ b/octave_to_python.cc	Mon May 01 08:41:01 2017 -0700
@@ -40,8 +40,6 @@
 #include "oct-py-types.h"
 #include "oct-py-util.h"
 
-using namespace boost::python;
-
 namespace pytave
 {
 
@@ -155,7 +153,8 @@
                      const octave_value& octvalue)
   {
     PyArrayObject *pyarr = octvalue_to_pyarrobj (octvalue);
-    py_object = object (handle<PyObject> ((PyObject *)pyarr));
+    py_object = boost::python::object
+        { boost::python::handle<> ((PyObject *)pyarr) };
   }
 
   void octvalue_to_pyobj (boost::python::object& py_object,
@@ -170,23 +169,23 @@
     else if (octvalue.is_string ())
       {
         PyObject *obj = make_py_str (octvalue.string_value ());
-        py_object = object (handle<PyObject> (obj));
+        py_object = boost::python::object { boost::python::handle<> (obj) };
       }
     else if (octvalue.is_scalar_type ())
       {
         PyObject *obj = make_py_numeric_value (octvalue);
-        py_object = object (handle<PyObject> (obj));
+        py_object = boost::python::object { boost::python::handle<> (obj) };
       }
     else if (octvalue.is_cell ())
       {
         PyObject *obj = make_py_tuple (octvalue.cell_value ());
-        py_object = object (handle<PyObject> (obj));
+        py_object = boost::python::object { boost::python::handle<> (obj) };
       }
     else if (octvalue.is_numeric_type () && octvalue.ndims () == 2
              && (octvalue.columns () <= 1 || octvalue.rows () <= 1))
       {
         PyObject *obj = make_py_array (octvalue);
-        py_object = object (handle<PyObject> (obj));
+        py_object = boost::python::object { boost::python::handle<> (obj) };
       }
     else if (octvalue.is_numeric_type () || octvalue.is_string ()
              || octvalue.is_bool_type ())
@@ -194,12 +193,12 @@
     else if (octvalue.is_map () && octvalue.numel () == 1)
       {
         PyObject *obj = make_py_dict (octvalue.scalar_map_value ());
-        py_object = object (handle<PyObject> (obj));
+        py_object = boost::python::object { boost::python::handle<> (obj) };
       }
     else if (octvalue.is_object () && octvalue.class_name () == "pyobject")
       {
         PyObject *obj = pyobject_unwrap_object (octvalue);
-        py_object = object (handle<PyObject> (obj));
+        py_object = boost::python::object { boost::python::handle<> (obj) };
       }
     else
       throw value_convert_exception (