From 84a6baab2652d3703152c9a687ccb1add0456900 Mon Sep 17 00:00:00 2001
From: zhihaoy <43971430+zhihaoy@users.noreply.github.com>
Date: Fri, 15 Feb 2019 15:57:48 -0600
Subject: [PATCH] [xtensor] Upgrade xtensor, xsimd, and xtl (#5338)

One patch down, accepted by upstream.
---
 ports/xsimd/CONTROL                       |  2 +-
 ports/xsimd/PatchHeaderIncludeGuard.patch | 24 -----------------------
 ports/xsimd/portfile.cmake                |  5 ++---
 ports/xtensor/CONTROL                     |  2 +-
 ports/xtensor/portfile.cmake              |  4 ++--
 ports/xtl/CONTROL                         |  2 +-
 ports/xtl/portfile.cmake                  |  4 ++--
 7 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 ports/xsimd/PatchHeaderIncludeGuard.patch

diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL
index f75d920ab2..e5f8d0f143 100644
--- a/ports/xsimd/CONTROL
+++ b/ports/xsimd/CONTROL
@@ -1,5 +1,5 @@
 Source: xsimd
-Version: 7.1.2
+Version: 7.1.3
 Description: Modern, portable C++ wrappers for SIMD intrinsics
 
 Feature: xcomplex
diff --git a/ports/xsimd/PatchHeaderIncludeGuard.patch b/ports/xsimd/PatchHeaderIncludeGuard.patch
deleted file mode 100644
index 73ba4a9bfe..0000000000
--- a/ports/xsimd/PatchHeaderIncludeGuard.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/include/xsimd/stl/algorithms.hpp b/include/xsimd/stl/algorithms.hpp
-index 4cb2b79..1590b89 100644
---- a/include/xsimd/stl/algorithms.hpp
-+++ b/include/xsimd/stl/algorithms.hpp
-@@ -6,6 +6,9 @@
- * The full license is in the file LICENSE, distributed with this software. *
- ****************************************************************************/
- 
-+#ifndef XSIMD_ALGORITHMS_HPP
-+#define XSIMD_ALGORITHMS_HPP
-+
- #include "xsimd/memory/xsimd_load_store.hpp"
- 
- namespace xsimd
-@@ -126,4 +129,6 @@ namespace xsimd
- 
-         #undef XSIMD_LOOP_MACRO
-     }
--}
-\ No newline at end of file
-+}
-+
-+#endif
-\ No newline at end of file
diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake
index 7e128cd8f8..3b51bd9a82 100644
--- a/ports/xsimd/portfile.cmake
+++ b/ports/xsimd/portfile.cmake
@@ -5,10 +5,9 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xsimd
-    REF 7.1.2
-    SHA512 9479eb6188a68388d470e38ec7b08aaeeb03a1028a574258b52e1c39ce0b1b1aaf97a5cb898447f68c989badd23903ba7a059f5daf59160c660ba751d668c0eb
+    REF 7.1.3
+    SHA512 9f0e2babee9a3a80e16440466277bd635a26197f80cdf806312f7e1cc616db59062887566d50b4cdebe3c3ba4d60155b477684177607428aee53e1d5a95de926
     HEAD_REF master
-    PATCHES PatchHeaderIncludeGuard.patch
 )
 
 if("xcomplex" IN_LIST FEATURES)
diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL
index 01614cba08..9b84a6ff34 100644
--- a/ports/xtensor/CONTROL
+++ b/ports/xtensor/CONTROL
@@ -1,5 +1,5 @@
 Source: xtensor
-Version: 2019-01-20
+Version: 0.19.3
 Description: C++ tensors with broadcasting and lazy computing
 Build-Depends: nlohmann-json, xtl
 
diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake
index 795bb3ce86..99f52d1959 100644
--- a/ports/xtensor/portfile.cmake
+++ b/ports/xtensor/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtensor
-    REF ca0cfdbde852ee61a3ef20076e2733030f3d6479
-    SHA512 d960a3c1c3e6c9250c6bc5ed4e641486980a3ffa4179696eabb92fee50673901324cd2174b76cbd74ab07e6f3c175a26cb564b3087863602c3dce0a83a263da6
+    REF 0.19.3
+    SHA512 e3b0085115252441ef4ddf21ef48ca18c3872c24d7f94d2f7533fa8f4b00dff0b5613946296f9dd4d7db3381ff43b41dd2f1ae3857a409fabd439eade431aba2
     HEAD_REF master
 )
 
diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL
index f5158ebe5b..1ee82f60a7 100644
--- a/ports/xtl/CONTROL
+++ b/ports/xtl/CONTROL
@@ -1,4 +1,4 @@
 Source: xtl
-Version: 0.5.3
+Version: 0.5.4
 Build-Depends: nlohmann-json
 Description: The x template library.
diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake
index 23a6f9f447..66e504b732 100644
--- a/ports/xtl/portfile.cmake
+++ b/ports/xtl/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtl
-    REF 0.5.3
-    SHA512 340e10a113d88be81833e8c123835de0fd30bc9b80387cd260edbff5e54ff2d78a72f77ec8803e3031f54f32c7f189a7afc9e0c1b7446fc6340a4482f308ccbf
+    REF 0.5.4
+    SHA512 6181334dda9a2afce4ce2809572605c2f911770f7805a8328e14fa94d4572475c7725f2ead54daec00e62933df6a4c22616a247798c5b7f1f3bd4290945776c8
     HEAD_REF master
 )