X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FExternalTransforms.cpp;h=76578b2ea0814edc6fbc25ef6459fa213483c7c7;hb=8124e6c02ea1fd6779bb6c47ffe2bca2c8bd2d97;hp=4f85f9d479f00c202728b20dc39186dcee5ffb02;hpb=e30f3d76d2bee0011ceaeb5f0cc221156458cbad;p=lyx.git

diff --git a/src/insets/ExternalTransforms.cpp b/src/insets/ExternalTransforms.cpp
index 4f85f9d479..76578b2ea0 100644
--- a/src/insets/ExternalTransforms.cpp
+++ b/src/insets/ExternalTransforms.cpp
@@ -18,9 +18,8 @@
 #include "support/lyxlib.h" // float_equal
 #include "support/Translator.h"
 
-#include "support/regex.h"
-
 #include <cmath> // abs
+#include <regex>
 #include <sstream>
 
 using namespace std;
@@ -282,8 +281,8 @@ string const sanitizeLatexOption(string const & input)
 	// Strip any leading commas
 	// "[,,,,foo..." -> "foo..." ("foo..." may be empty)
 	string output;
-	lyx::smatch what;
-	static lyx::regex const front("^( *\\[,*)(.*)$");
+	smatch what;
+	static regex const front("^( *\\[,*)(.*)$");
 
 	if (!regex_match(it, end, what, front)) {
 		lyxerr << "Unable to sanitize LaTeX \"Option\": "
@@ -295,7 +294,7 @@ string const sanitizeLatexOption(string const & input)
 	// Replace any consecutive commas with a single one
 	// "foo,,,,bar" -> "foo,bar"
 	// with iterator now pointing to 'b'
-	static lyx::regex const commas("([^,]*)(,,*)(.*)$");
+	static regex const commas("([^,]*)(,,*)(.*)$");
 	for (; it != end;) {
 		if (!regex_match(it, end, what, commas)) {
 			output += string(it, end);
@@ -307,7 +306,7 @@ string const sanitizeLatexOption(string const & input)
 
 	// Strip any trailing commas
 	// "...foo,,,]" -> "...foo" ("...foo,,," may be empty)
-	static lyx::regex const back("^(.*[^,])?,*\\] *$");
+	static regex const back("^(.*[^,])?,*\\] *$");
 	if (!regex_match(output, what, back)) {
 		lyxerr << "Unable to sanitize LaTeX \"Option\": "
 		       << output << '\n';
@@ -326,13 +325,13 @@ string const sanitizeLatexOption(string const & input)
 namespace {
 
 template <typename Factory, typename Data, typename Transformer>
-void extractIt(boost::any const & any_factory,
+void extractIt(any const & any_factory,
 	       Data const & data, Transformer & transformer)
 {
 	if (any_factory.type() != typeid(Factory))
 		return;
 
-	Factory factory = boost::any_cast<Factory>(any_factory);
+	Factory factory = any_cast<Factory>(any_factory);
 	if (factory)
 		transformer = factory(data);
 }