From 67231cbba0411a90a9091dbc24e26dfd45df94d2 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Mon, 27 Nov 2017 10:02:54 -0500
Subject: [PATCH] Bump to exprtk submodule to latest (#4013)

---
 plugins/Xpressive/CMakeLists.txt   |  6 ------
 plugins/Xpressive/exprtk           |  2 +-
 plugins/Xpressive/exprtk.hpp.patch | 13 -------------
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 plugins/Xpressive/exprtk.hpp.patch

diff --git a/plugins/Xpressive/CMakeLists.txt b/plugins/Xpressive/CMakeLists.txt
index 6db01f46de5..6745c71d5bf 100644
--- a/plugins/Xpressive/CMakeLists.txt
+++ b/plugins/Xpressive/CMakeLists.txt
@@ -10,12 +10,6 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_io_file")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_vecops")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAGS} -fexceptions")
 
-# See https://github.com/ArashPartow/exprtk/pull/9
-IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-	EXECUTE_PROCESS(COMMAND patch exprtk/exprtk.hpp exprtk.hpp.patch
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET)
-ENDIF()
-
 IF(LMMS_BUILD_WIN32 AND NOT MSVC)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -Dexprtk_disable_enhanced_features")
 ENDIF()
diff --git a/plugins/Xpressive/exprtk b/plugins/Xpressive/exprtk
index 21bb5ecb7c7..aad301a6ebb 160000
--- a/plugins/Xpressive/exprtk
+++ b/plugins/Xpressive/exprtk
@@ -1 +1 @@
-Subproject commit 21bb5ecb7c776e4fec47d4b0ef99770f3d4527d7
+Subproject commit aad301a6ebbab769620b0bb0e77713c4659117a6
diff --git a/plugins/Xpressive/exprtk.hpp.patch b/plugins/Xpressive/exprtk.hpp.patch
deleted file mode 100644
index 21dc89db892..00000000000
--- a/plugins/Xpressive/exprtk.hpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/exprtk.hpp b/exprtk.hpp
-index 916e74b..ae7de24 100644
---- a/exprtk.hpp
-+++ b/exprtk.hpp
-@@ -1962,7 +1962,7 @@ namespace exprtk
-       template <typename T>
-       inline bool string_to_real(const std::string& s, T& t)
-       {
--         const typename numeric::details::number_type<T>::type num_type;
-+         typename numeric::details::number_type<T>::type num_type;
- 
-          const char_t* begin = s.data();
-          const char_t* end   = s.data() + s.size();