appease gcc method overload warning

Genivia · Nov 25, 2024 · 3445a32 · 3445a32
1 parent df51d8a
commit 3445a32
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/fuzzy/fuzzymatcher.h b/fuzzy/fuzzymatcher.h
@@ -118,8 +118,9 @@ class FuzzyMatcher : public Matcher {
     DBGLOG("FuzzyMatcher::FuzzyMatcher(matcher)");
     bpt_.resize(max_);
   }
+  using Matcher::operator=;
   /// Assign a matcher.
-  FuzzyMatcher& operator=(const FuzzyMatcher& matcher) ///< matcher to copy
+  virtual FuzzyMatcher& operator=(const FuzzyMatcher& matcher) ///< matcher to copy
   {
     Matcher::operator=(matcher);
     max_ = matcher.max_;

diff --git a/include/reflex/boostmatcher.h b/include/reflex/boostmatcher.h
@@ -89,8 +89,9 @@ class BoostMatcher : public PatternMatcher<boost::regex> {
       PatternMatcher<boost::regex>(matcher),
       flg_(matcher.flg_)
   { }
+  using PatternMatcher::operator=;
   /// Assign a matcher.
-  BoostMatcher& operator=(const BoostMatcher& matcher) ///< matcher to copy
+  virtual BoostMatcher& operator=(const BoostMatcher& matcher) ///< matcher to copy
   {
     PatternMatcher<boost::regex>::operator=(matcher);
     flg_ = matcher.flg_;

diff --git a/include/reflex/fuzzymatcher.h b/include/reflex/fuzzymatcher.h
@@ -118,8 +118,9 @@ class FuzzyMatcher : public Matcher {
     DBGLOG("FuzzyMatcher::FuzzyMatcher(matcher)");
     bpt_.resize(max_);
   }
+  using Matcher::operator=;
   /// Assign a matcher.
-  FuzzyMatcher& operator=(const FuzzyMatcher& matcher) ///< matcher to copy
+  virtual FuzzyMatcher& operator=(const FuzzyMatcher& matcher) ///< matcher to copy
   {
     Matcher::operator=(matcher);
     max_ = matcher.max_;

diff --git a/include/reflex/matcher.h b/include/reflex/matcher.h
@@ -50,7 +50,7 @@ class Matcher : public PatternMatcher<reflex::Pattern> {
   template<typename T>
   static std::string convert(T regex, convert_flag_type flags = convert_flag::none, bool *multiline = NULL)
   {
-    return reflex::convert(regex, "imsx#=^:abcdefhijklnrstuvwxzABDHLNQSUW<>?", flags, multiline);
+    return reflex::convert(regex, "imsx#=^:abcdefhijklnrstuvwxzABDHLNQSUW0<>?", flags, multiline);
   }
   /// Default constructor.
   Matcher() : PatternMatcher<reflex::Pattern>()
@@ -107,17 +107,19 @@ class Matcher : public PatternMatcher<reflex::Pattern> {
     DBGLOG("Matcher::Matcher(matcher)");
     init_advance();
   }
+  using PatternMatcher::operator=;
   /// Assign a matcher, the underlying pattern string is shared (not deep copied).
-  Matcher& operator=(const Matcher& matcher) ///< matcher to copy
+  virtual Matcher& operator=(const Matcher& matcher) ///< matcher to copy
   {
     PatternMatcher<reflex::Pattern>::operator=(matcher);
     ded_ = matcher.ded_;
     tab_ = matcher.tab_;
     init_advance();
     return *this;
   }
+  using PatternMatcher::pattern;
   /// Set the pattern to use with this matcher (the given pattern is shared and must be persistent).
-  Matcher& pattern(const Pattern& pattern) ///< pattern object for this matcher
+  virtual Matcher& pattern(const Pattern& pattern) ///< pattern object for this matcher
     /// @returns this matcher
   {
     DBGLOG("Matcher::pattern()");
@@ -129,7 +131,7 @@ class Matcher : public PatternMatcher<reflex::Pattern> {
     return *this;
   }
   /// Set the pattern to use with this matcher (the given pattern is shared and must be persistent).
-  Matcher& pattern(const Pattern *pattern) ///< pattern object for this matcher
+  virtual Matcher& pattern(const Pattern *pattern) ///< pattern object for this matcher
     /// @returns this matcher
   {
     DBGLOG("Matcher::pattern()");
@@ -141,7 +143,7 @@ class Matcher : public PatternMatcher<reflex::Pattern> {
     return *this;
   }
   /// Set the pattern from a regex string to use with this matcher.
-  Matcher& pattern(const char *pattern) ///< regex string to instantiate internal pattern object
+  virtual Matcher& pattern(const char *pattern) ///< regex string to instantiate internal pattern object
     /// @returns this matcher
   {
     DBGLOG("Matcher::pattern(\"%s\")", pattern);
@@ -150,7 +152,7 @@ class Matcher : public PatternMatcher<reflex::Pattern> {
     return *this;
   }
   /// Set the pattern from a regex string to use with this matcher.
-  Matcher& pattern(const std::string& pattern) ///< regex string to instantiate internal pattern object
+  virtual Matcher& pattern(const std::string& pattern) ///< regex string to instantiate internal pattern object
     /// @returns this matcher
   {
     DBGLOG("Matcher::pattern(\"%s\")", pattern.c_str());

diff --git a/include/reflex/pcre2matcher.h b/include/reflex/pcre2matcher.h
@@ -133,8 +133,9 @@ class PCRE2Matcher : public PatternMatcher<std::string> {
     if (opc_ != NULL)
       pcre2_code_free(opc_);
   }
+  using PatternMatcher::operator=;
   /// Assign a matcher.
-  PCRE2Matcher& operator=(const PCRE2Matcher& matcher) ///< matcher to copy
+  virtual PCRE2Matcher& operator=(const PCRE2Matcher& matcher) ///< matcher to copy
   {
     PatternMatcher<std::string>::operator=(matcher);
     pattern(matcher);
@@ -488,6 +489,7 @@ class PCRE2UTFMatcher : public PCRE2Matcher {
     :
       PCRE2Matcher(pattern, input, opt, PCRE2_UTF | PCRE2_UCP)
   { }
+  using PCRE2Matcher::operator=;
 };
 
 } // namespace reflex

diff --git a/include/reflex/stdmatcher.h b/include/reflex/stdmatcher.h
@@ -86,6 +86,7 @@ class StdMatcher : public PatternMatcher<std::regex> {
       PatternMatcher<std::regex>(matcher),
       flg_(matcher.flg_)
   { }
+  using PatternMatcher::operator=;
   /// Assign a matcher.
   StdMatcher& operator=(const StdMatcher& matcher) ///< matcher to copy
   {