Merge pull request #704 from izaid/id

Updates to match libdynd

Author: izaid

dynd/include/type_functions.hpp

@@ -20,8 +20,8 @@
 #include <dynd/types/struct_type.hpp>
 #include <dynd/types/type_type.hpp>
 
-#include "utility_functions.hpp"
 #include "type_conversions.hpp"
+#include "utility_functions.hpp"
 #include "visibility.hpp"
 
 // Python's datetime C API
@@ -166,7 +166,7 @@ inline dynd::ndt::type dynd_make_fixed_dim_type(PyObject *shape, const dynd::ndt
 {
   std::vector<intptr_t> shape_vec;
   pyobject_as_vector_intp(shape, shape_vec, true);
-  return dynd::ndt::make_fixed_dim(shape_vec.size(), &shape_vec[0], element_tp);
+  return dynd::ndt::make_type(shape_vec.size(), &shape_vec[0], element_tp);
 }
 
 inline void init_type_functions()

dynd/src/numpy_type_interop.cpp

@@ -368,13 +368,13 @@ dynd::ndt::type pydynd::array_from_numpy_array2(PyArrayObject *obj)
   PyArray_Descr *dtype = PyArray_DESCR(obj);
 
   if (PyDataType_FLAGCHK(dtype, NPY_ITEM_HASOBJECT)) {
-    return dynd::ndt::make_fixed_dim(PyArray_NDIM(obj), PyArray_SHAPE(obj),
-                                     pydynd::_type_from_numpy_dtype(dtype).get_canonical_type());
+    return dynd::ndt::make_type(PyArray_NDIM(obj), PyArray_SHAPE(obj),
+                                pydynd::_type_from_numpy_dtype(dtype).get_canonical_type());
   }
   else {
     // Get the dtype of the array
     dynd::ndt::type d = pydynd::_type_from_numpy_dtype(PyArray_DESCR(obj), get_alignment_of(obj));
-    return dynd::ndt::make_fixed_dim(PyArray_NDIM(obj), PyArray_DIMS(obj), d);
+    return dynd::ndt::make_type(PyArray_NDIM(obj), PyArray_DIMS(obj), d);
   }
 }