Move headers and source files out of the types/ directory again.

Author: skrah

CMakeLists.txt

@@ -163,23 +163,23 @@ cython_add_module(dynd.nd.array dynd.nd.array_pyx True
                   dynd/src/init.cpp
                   dynd/src/functional.cpp
                   dynd/src/numpy_interop.cpp
-                  dynd/src/types/type_conversions.cpp
-                  dynd/src/types/type_deduction.cpp
+                  dynd/src/type_conversions.cpp
+                  dynd/src/type_deduction.cpp
                   dynd/src/types/pyobject_type.cpp
                   )
 
 cython_add_module(dynd.config dynd.config_pyx True
                   dynd/include/exception_translation.hpp
                   dynd/src/array_conversions.cpp
-                  dynd/src/types/type_conversions.cpp
-                  dynd/src/types/type_deduction.cpp
+                  dynd/src/type_conversions.cpp
+                  dynd/src/type_deduction.cpp
                   ${CMAKE_CURRENT_BINARY_DIR}/dynd/src/git_version.cpp
                   )
 
 foreach(module dynd.ndt.type dynd.ndt.json dynd.nd.callable dynd.nd.functional dynd.nd.registry)
     cython_add_module(${module} ${module}_pyx True
                       # Additional C++ source files:
-                      dynd/src/types/type_conversions.cpp
+                      dynd/src/type_conversions.cpp
                       dynd/src/array_conversions.cpp)
 endforeach(module)
 

dynd/include/array_functions.hpp

@@ -28,7 +28,7 @@
 #include "array_from_py.hpp"
 #include "array_conversions.hpp"
 #include "utility_functions.hpp"
-#include "types/type_functions.hpp"
+#include "type_functions.hpp"
 #include "types/pyobject_type.hpp"
 #include "visibility.hpp"
 

dynd/include/kernels/apply_jit_kernel.hpp

@@ -3,8 +3,8 @@
 #include <dynd/kernels/base_kernel.hpp>
 #include <array_functions.hpp>
 #include <utility_functions.hpp>
-#include <types/type_functions.hpp>
 
+#include "type_functions.hpp"
 #include "array_conversions.hpp"
 
 namespace pydynd {

dynd/include/kernels/apply_pyobject_kernel.hpp

@@ -4,7 +4,7 @@
 #include <dynd/func/assignment.hpp>
 
 #include "array_conversions.hpp"
-#include "types/type_functions.hpp"
+#include "type_functions.hpp"
 #include "types/pyobject_type.hpp"
 
 struct apply_pyobject_kernel

dynd/include/kernels/assign_from_pyobject_kernel.hpp

@@ -17,8 +17,8 @@
 #include "array_functions.hpp"
 #include "array_conversions.hpp"
 #include "copy_from_numpy_arrfunc.hpp"
-#include "types/type_functions.hpp"
-#include "types/type_deduction.hpp"
+#include "type_functions.hpp"
+#include "type_deduction.hpp"
 #include "types/pyobject_type.hpp"
 
 using namespace dynd;

dynd/include/numpy_interop.hpp

@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "utility_functions.hpp"
-#include "types/type_functions.hpp"
+#include "type_functions.hpp"
 
 // Define this to 1 or 0 depending on whether numpy interop
 // should be compiled in.

dynd/include/types/type_conversions.hpp renamed to dynd/include/type_conversions.hpp

@@ -11,7 +11,7 @@
 
 #include <dynd/type_registry.hpp>
 
-#include "pyobject_type.hpp"
+#include "types/pyobject_type.hpp"
 
 using namespace dynd;