commit 91e1bd6bfb65757d063cb2c46bd5bfde1bd0d424
author Derek Mauro <dmauro@google.com> Tue Jun 08 18:36:29 2021 -0400
committer Derek Mauro <dmauro@google.com> Tue Jun 08 18:36:29 2021 -0400
tree 6e8c5a1aa03ff993737839f3ea7f31a3e27226f3
parent 9d698f6905a1a06d6f1109ab1c1e2309b08de2ac
parent 26a1569c72e85a77096cae6fbe95228a4ca765d6

Merge pull request #3421 from florin-crisan:bugfix/3420-dll-link-failure

PiperOrigin-RevId: 377367006

googletest/include/gtest/gtest-matchers.h

diff --git a/googletest/include/gtest/gtest-matchers.h b/googletest/include/gtest/gtest-matchers.h
index 2bd3dcf..9fa34a0 100644
--- a/googletest/include/gtest/gtest-matchers.h
+++ b/googletest/include/gtest/gtest-matchers.h
@@ -106,7 +106,7 @@
 
 // An instance of a subclass of this knows how to describe itself as a
 // matcher.
-class MatcherDescriberInterface {
+class GTEST_API_ MatcherDescriberInterface {
  public:
   virtual ~MatcherDescriberInterface() {}
 

googletest/include/gtest/internal/gtest-param-util.h

diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h
index 4af22ca..c2ef6e3 100644
--- a/googletest/include/gtest/internal/gtest-param-util.h
+++ b/googletest/include/gtest/internal/gtest-param-util.h
@@ -654,7 +654,7 @@
 
     // Check for invalid characters
     for (std::string::size_type index = 0; index < name.size(); ++index) {
-      if (!isalnum(name[index]) && name[index] != '_')
+      if (!IsAlNum(name[index]) && name[index] != '_')
         return false;
     }