Use std::regex instead of std::basic_regex<char>.

5 files changed, 7 insertions, 7 deletions

diff --git a/document/src/vespa/document/select/operator.cpp b/document/src/vespa/document/select/operator.cpp
index 36113844d88..85dbef5ad9b 100644
--- a/document/src/vespa/document/select/operator.cpp
+++ b/document/src/vespa/document/select/operator.cpp
@@ -128,7 +128,7 @@ RegexOperator::match(const vespalib::string& val, vespalib::stringref expr) cons
         // Should we catch this in parsing?
     if (expr.size() == 0) return ResultList(Result::True);
     try {
-        std::basic_regex<char> expression(expr.data(), expr.size());
+        std::regex expression(expr.data(), expr.size());
         return ResultList(Result::get(std::regex_search(val.c_str(), val.c_str() + val.size(), expression)));
     } catch (std::regex_error &) {
         return ResultList(Result::False);
diff --git a/logd/src/tests/watcher/watcher_test.cpp b/logd/src/tests/watcher/watcher_test.cpp
index 9f7c476e101..7e7585f9209 100644
--- a/logd/src/tests/watcher/watcher_test.cpp
+++ b/logd/src/tests/watcher/watcher_test.cpp
@@ -22,7 +22,7 @@ using vespalib::ThreadStackExecutor;
 using vespalib::makeLambdaTask;
 using namespace std::chrono_literals;
 
-std::basic_regex<char> rotated_log(R"(vespa.log-[0-9]*-[0-9]*-[0-9]*\.[0-9]*-[0-9]*-[0-9]*)");
+std::regex rotated_log(R"(vespa.log-[0-9]*-[0-9]*-[0-9]*\.[0-9]*-[0-9]*-[0-9]*)");
 
 namespace logdemon {
 
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index a3acbfdbfe0..38b85594a62 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -657,7 +657,7 @@ Test::requireThatSummariesTimeout()
     vespalib::Slime summary = getSlime(*rep, 0, false);
     JsonFormat::encode(summary, buf, false);
     auto bufstring = buf.get().make_stringref(); 
-    EXPECT_TRUE(std::regex_search(bufstring.data(), bufstring.data() + bufstring.size(), std::basic_regex<char>("Timed out with -[0-9]+us left.")));
+    EXPECT_TRUE(std::regex_search(bufstring.data(), bufstring.data() + bufstring.size(), std::regex("Timed out with -[0-9]+us left.")));
 }
 
 void
diff --git a/vespalib/src/vespa/vespalib/testkit/test_hook.cpp b/vespalib/src/vespa/vespalib/testkit/test_hook.cpp
index 0b627f8d0bf..b6020dcb879 100644
--- a/vespalib/src/vespa/vespalib/testkit/test_hook.cpp
+++ b/vespalib/src/vespa/vespalib/testkit/test_hook.cpp
@@ -98,7 +98,7 @@ TestHook::runAll()
     FastOSTestThreadFactory threadFactory;
     TestThreadFactory::factory = &threadFactory;
     std::string name = TestMaster::master.getName();
-    std::basic_regex<char> pattern(lookup_subset_pattern(name), std::regex::extended);
+    std::regex pattern(lookup_subset_pattern(name), std::regex::extended);
     size_t testsPassed = 0;
     size_t testsFailed = 0;
     size_t testsIgnored = 0;
diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp
index b12282910bf..bb30cdd89e9 100644
--- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp
+++ b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp
@@ -156,9 +156,9 @@ FieldSearchSpecMap::~FieldSearchSpecMap() {}
 namespace {
     const std::string _G_empty("");
     const std::string _G_value(".value");
-    const std::basic_regex<char> _G_map1("\\{[a-zA-Z0-9]+\\}");
-    const std::basic_regex<char> _G_map2("\\{\".*\"\\}");
-    const std::basic_regex<char> _G_array("\\[[0-9]+\\]");
+    const std::regex _G_map1("\\{[a-zA-Z0-9]+\\}");
+    const std::regex _G_map2("\\{\".*\"\\}");
+    const std::regex _G_array("\\[[0-9]+\\]");
 }
 
 vespalib::string FieldSearchSpecMap::stripNonFields(const vespalib::string & rawIndex)