Merge pull request #140 from SylvainCorlay/default_assignable_layout

Stop using DEFAULT_LAYOUT macro

Author: JohanMabille

.appveyor.yml

@@ -24,7 +24,7 @@ install:
   - conda info -a
   - conda install gtest cmake -c conda-forge
   - conda install pytest numpy pybind11==2.2.1 -c conda-forge
-  - conda install xtensor==0.15.1 -c QuantStack
+  - conda install xtensor==0.15.8 -c QuantStack
   - "set PYTHONHOME=%MINICONDA%"
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
   - nmake test_xtensor_python

.travis.yml

@@ -75,7 +75,7 @@ before_install:
       elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         export CXX=clang++ CC=clang PYTHONHOME=$HOME/miniconda;
       fi
-    
+
 install:
     # Define the version of miniconda to download
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
@@ -97,7 +97,7 @@ install:
     - conda info -a
     - conda install pytest numpy pybind11==2.2.1 -c conda-forge
     - conda install cmake gtest -c conda-forge
-    - conda install xtensor==0.15.1 -c QuantStack
+    - conda install xtensor==0.15.8 -c QuantStack
     - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
     - make -j2 test_xtensor_python
     - make install

include/xtensor-python/pycontainer.hpp

@@ -326,10 +326,7 @@ namespace xt
             throw std::runtime_error("Cannot reshape with incorrect number of elements.");
         }
 
-        if (layout == layout_type::dynamic || layout == layout_type::any)
-        {
-            layout = DEFAULT_LAYOUT;
-        }
+        layout = default_assignable_layout(layout);
 
         NPY_ORDER npy_layout;
         if (layout == layout_type::row_major)