commit a84f9718f35f62ae2a7a32abb016a1fa9862346a
author Paul Wankadia <junyer@google.com> Fri Oct 09 00:01:24 2020 -0700
committer Paul Wankadia <junyer@google.com> Fri Oct 09 07:02:37 2020 +0000
tree 120271b2874ed94a7fdd4ab37f920ad2ce8df2d1
parent 7c2e104ffbe4383a9d2933428d4bc104ff16cdb2

Ensure that RE2::Arg works even with overloaded ParseFrom().

Change-Id: I1dc33738a3c5829e898c736a5d435900c9867bcf
Reviewed-on: https://code-review.googlesource.com/c/re2/+/57970
Reviewed-by: Paul Wankadia <junyer@google.com>

re2/re2.h

diff --git a/re2/re2.h b/re2/re2.h
index 02fc88f..28b2932 100644
--- a/re2/re2.h
+++ b/re2/re2.h
@@ -829,7 +829,8 @@
 
   template <typename T>
   using CanParseFrom = typename std::enable_if<
-      std::is_member_function_pointer<decltype(&T::ParseFrom)>::value,
+      std::is_member_function_pointer<decltype(
+          (bool (T::*)(const char*, size_t))&T::ParseFrom)>::value,
       int>::type;
 
  public:

re2/testing/re2_arg_test.cc

diff --git a/re2/testing/re2_arg_test.cc b/re2/testing/re2_arg_test.cc
index ea3c517..a0d1e46 100644
--- a/re2/testing/re2_arg_test.cc
+++ b/re2/testing/re2_arg_test.cc
@@ -148,6 +148,8 @@
       LOG(INFO) << "str = " << str << ", n = " << n;
       return false;
     }
+    // Ensure that RE2::Arg works even with overloaded ParseFrom().
+    void ParseFrom(const char* str) {}
   } obj2;
   RE2::Arg arg2(&obj2);
   EXPECT_FALSE(arg2.Parse("two", 3));