Merge pull request #198 from JohanMabille/allocator

Upgraded to xtensor 0.20.6

Author: JohanMabille

.appveyor.yml

@@ -22,7 +22,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install pytest numpy pybind11==2.2.1 xtensor==0.20.4 -c conda-forge
+  - conda install pytest numpy pybind11==2.2.1 xtensor==0.20.6 -c conda-forge
   - "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

@@ -147,7 +147,7 @@ install:
       else
         conda install pybind11==${PYBIND11_VERSION} -c conda-forge
       fi
-    - conda install xtensor==0.20.4 -c conda-forge
+    - conda install xtensor==0.20.6 -c conda-forge
     - cmake -D DOWNLOAD_GTEST=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
     - make -j2 test_xtensor_python
     - make install

README.md

@@ -195,7 +195,7 @@ from the `docs` subdirectory.
 
 | `xtensor-python` | `xtensor` |  `pybind11`      |
 |------------------|-----------|------------------|
-| master           |  ^0.20.4  | ~2.2.1           |
+| master           |  ^0.20.6  | ~2.2.1           |
 | 0.23.0           |  ^0.20.4  | ~2.2.1           |
 | 0.22.x           |  ^0.19.0  | ~2.2.1           |
 | 0.21.x           |  ^0.18.0  | ~2.2.1           |

include/xtensor-python/pycontainer.hpp

@@ -464,6 +464,8 @@ namespace xt
         {
             std::allocator<long long> a;
             std::allocator<unsigned long long> b;
+            std::allocator<double> c;
+            std::allocator<std::complex<double>> d;
         }
     }
 #endif