Merge branch 'master' into deprecate

2018-07-19 11:07:10 -04:00
parent 378de8f72a 1370e7658b
commit 1f9c668a04
8 changed files with 1721 additions and 2118 deletions
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -1234,7 +1234,7 @@ class scoped_ptr {
 // Defines RE.

 #if GTEST_USES_PCRE
-using ::RE;
+// if used, PCRE is injected by custom/gtest-port.h
 #elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE

 // A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended