aboutsummaryrefslogtreecommitdiff
path: root/ports/xsimd
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2019-02-27 11:56:29 -0800
committerPhil Christensen <philc@microsoft.com>2019-02-27 11:56:29 -0800
commit2cc7fa27e57f1129d1f37ccb009563509ca25720 (patch)
tree3c75e423b71e54f6f65ec085c5d3d190d9d0d1a9 /ports/xsimd
parent3830517ec7519b823f5d8c404710889c6bd00278 (diff)
parent2dfa568d186e4f0d199040929f9b3e44f27c8943 (diff)
downloadvcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.tar.gz
vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/5254
Diffstat (limited to 'ports/xsimd')
-rw-r--r--ports/xsimd/CONTROL2
-rw-r--r--ports/xsimd/PatchHeaderIncludeGuard.patch24
-rw-r--r--ports/xsimd/portfile.cmake5
3 files changed, 3 insertions, 28 deletions
diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL
index f75d920ab..e5f8d0f14 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 73ba4a9bf..000000000
--- 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 7e128cd8f..3b51bd9a8 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)