[Boost-commit] svn:boost r68937 - in sandbox/numpy: boost/python boost/python/numpy libs/python/numpy/test

Subject: [Boost-commit] svn:boost r68937 - in sandbox/numpy: boost/python boost/python/numpy libs/python/numpy/test
From: talljimbo_at_[hidden]
Date: 2011-02-15 19:24:25

Author: jbosch
Date: 2011-02-15 19:24:22 EST (Tue, 15 Feb 2011)
New Revision: 68937
URL: http://svn.boost.org/trac/boost/changeset/68937

Log:
Boost.Python.Numpy - moved convenience header one directory lower
Added:
   sandbox/numpy/boost/python/numpy.hpp
      - copied unchanged from r68936, /sandbox/numpy/boost/python/numpy/numpy.hpp
Removed:
   sandbox/numpy/boost/python/numpy/numpy.hpp
Text files modified: 
   sandbox/numpy/boost/python/numpy/internal.hpp          |     2 +-                                      
   sandbox/numpy/libs/python/numpy/test/templates_mod.cpp |     2 +-                                      
   sandbox/numpy/libs/python/numpy/test/ufunc_mod.cpp     |     2 +-                                      
   3 files changed, 3 insertions(+), 3 deletions(-)

Modified: sandbox/numpy/boost/python/numpy/internal.hpp
==============================================================================
--- sandbox/numpy/boost/python/numpy/internal.hpp	(original)
+++ sandbox/numpy/boost/python/numpy/internal.hpp	2011-02-15 19:24:22 EST (Tue, 15 Feb 2011)
@@ -21,7 +21,7 @@
 #define PY_UFUNC_UNIQUE_SYMBOL BOOST_UFUNC_ARRAY_API
 #include <numpy/arrayobject.h>
 #include <numpy/ufuncobject.h>
-#include <boost/python/numpy/numpy.hpp>
+#include <boost/python/numpy.hpp>
 
 #define NUMPY_OBJECT_MANAGER_TRAITS_IMPL(pytype,manager)                \
     PyTypeObject const * object_manager_traits<manager>::get_pytype() { return &pytype; }

Deleted: sandbox/numpy/boost/python/numpy/numpy.hpp
==============================================================================
--- sandbox/numpy/boost/python/numpy/numpy.hpp	2011-02-15 19:24:22 EST (Tue, 15 Feb 2011)
+++ (empty file)
@@ -1,33 +0,0 @@
-#ifndef BOOST_PYTHON_NUMPY_HPP_INCLUDED
-#define BOOST_PYTHON_NUMPY_HPP_INCLUDED
-
-/**
- *  @file boost/python/numpy.hpp
- *  @brief Main public header file for boost.python.numpy.
- */
-
-#include <boost/python/numpy/dtype.hpp>
-#include <boost/python/numpy/ndarray.hpp>
-#include <boost/python/numpy/scalars.hpp>
-#include <boost/python/numpy/matrix.hpp>
-#include <boost/python/numpy/ufunc.hpp>
-#include <boost/python/numpy/invoke_matching.hpp>
-
-namespace boost { namespace python {
-namespace numpy {
-
-/**
- *  @brief Initialize the Numpy C-API
- *
- *  This must be called before using anything in boost.python.numpy;
- *  It should probably be the first line inside BOOST_PYTHON_MODULE.
- *
- *  @internal This just calls the Numpy C-API functions "import_array()"
- *            and "import_ufunc()".
- */
-void initialize();
-
-} // namespace boost::python::numpy
-}} // namespace boost::python
-
-#endif // !BOOST_PYTHON_NUMPY_HPP_INCLUDED

Modified: sandbox/numpy/libs/python/numpy/test/templates_mod.cpp
==============================================================================
--- sandbox/numpy/libs/python/numpy/test/templates_mod.cpp	(original)
+++ sandbox/numpy/libs/python/numpy/test/templates_mod.cpp	2011-02-15 19:24:22 EST (Tue, 15 Feb 2011)
@@ -1,4 +1,4 @@
-#include <boost/python/numpy/numpy.hpp>
+#include <boost/python/numpy.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
 

Modified: sandbox/numpy/libs/python/numpy/test/ufunc_mod.cpp
==============================================================================
--- sandbox/numpy/libs/python/numpy/test/ufunc_mod.cpp	(original)
+++ sandbox/numpy/libs/python/numpy/test/ufunc_mod.cpp	2011-02-15 19:24:22 EST (Tue, 15 Feb 2011)
@@ -1,4 +1,4 @@
-#include <boost/python/numpy/numpy.hpp>
+#include <boost/python/numpy.hpp>
 
 namespace bp = boost::python;