diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-03-17 14:19:57 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-03-17 14:19:57 +0100 |
commit | 11a5b5f61ae0b1fef7085fc03662f1a0eaa44455 (patch) | |
tree | 3589810c8eabadbebbc046e0e7bff5488bbcb50b | |
parent | c27b4c34fc7b225e5b99629861fce5f5929af824 (diff) |
Specify template argument for std::basic_regex.
-rw-r--r-- | vespalib/src/vespa/vespalib/testkit/test_hook.cpp | 2 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/vespa/vespalib/testkit/test_hook.cpp b/vespalib/src/vespa/vespalib/testkit/test_hook.cpp index 2babd22842b..0b627f8d0bf 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 pattern(lookup_subset_pattern(name), std::regex::extended); + std::basic_regex<char> 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 9131b21ddc9..b12282910bf 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 _G_map1("\\{[a-zA-Z0-9]+\\}"); - const std::basic_regex _G_map2("\\{\".*\"\\}"); - const std::basic_regex _G_array("\\[[0-9]+\\]"); + 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]+\\]"); } vespalib::string FieldSearchSpecMap::stripNonFields(const vespalib::string & rawIndex) |