diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-19 15:07:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 15:07:10 (GMT) |
| commit | 1f9c668a0452148f725b242079f70d65d3e93153 (patch) | |
| tree | c7943a50a25fa435e9f823329f67e40c34a73147 /googletest/include | |
| parent | 378de8f72a43d1916774370aafea30e424e6d148 (diff) | |
| parent | 1370e7658b659247f3c37cd1f07d917d0bd546a0 (diff) | |
| download | googletest-1f9c668a0452148f725b242079f70d65d3e93153.zip googletest-1f9c668a0452148f725b242079f70d65d3e93153.tar.gz googletest-1f9c668a0452148f725b242079f70d65d3e93153.tar.bz2 | |
Merge branch 'master' into deprecate
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 727b41f..513b168 100644 --- 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 |