Merge pull request #739 from miloyip/issue728_threadsafe

Refactor regex

Merge pull request #739 from miloyip/issue728_threadsafe
Refactor regex
52682115 · Milo Yip · GitHub · 328ead0e · 769185d6 · 52682115
Commit 52682115 authored Sep 16, 2016 by Milo Yip Committed by GitHub Sep 16, 2016
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

regex.h include/rapidjson/internal/regex.h +0 -0

schema.h include/rapidjson/schema.h +2 -1

regextest.cpp test/unittest/regextest.cpp +0 -0

No files found.
--- a/include/rapidjson/internal/regex.h
+++ b/include/rapidjson/internal/regex.h
--- a/include/rapidjson/schema.h
+++ b/include/rapidjson/schema.h
@@ -1011,7 +1011,8 @@ private:
    }

    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType) {
-        return pattern->Search(str);
+        GenericRegexSearch<RegexType> rs(*pattern);
+        return rs.Search(str);
    }
 #elif RAPIDJSON_SCHEMA_USE_STDREGEX
    template <typename ValueType>

--- a/test/unittest/regextest.cpp
+++ b/test/unittest/regextest.cpp