summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest
diff options
context:
space:
mode:
authortisi1988 <tisi1988@gmail.com>2018-08-14 13:32:22 (GMT)
committerGitHub <noreply@github.com>2018-08-14 13:32:22 (GMT)
commit87a37c60e3144af5394c3e8c8b4c714bb8b07ad9 (patch)
tree914079fcbff6431fbacdc9e9bfcffc5060a11884 /googletest/include/gtest
parentefe27ac05c66c3fafad0ac0d279543f640ab30f7 (diff)
parent8bc11c040a1dcbe50c340b21d78175d152dd3837 (diff)
downloadgoogletest-87a37c60e3144af5394c3e8c8b4c714bb8b07ad9.zip
googletest-87a37c60e3144af5394c3e8c8b4c714bb8b07ad9.tar.gz
googletest-87a37c60e3144af5394c3e8c8b4c714bb8b07ad9.tar.bz2
Merge branch 'master' into master
Diffstat (limited to 'googletest/include/gtest')
-rw-r--r--googletest/include/gtest/internal/gtest-port.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 0f1b285..65ddf32 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -180,6 +180,7 @@
// GTEST_HAS_TYPED_TEST - typed tests
// GTEST_HAS_TYPED_TEST_P - type-parameterized tests
// GTEST_IS_THREADSAFE - Google Test is thread-safe.
+// GOOGLETEST_CM0007 DO NOT DELETE
// GTEST_USES_POSIX_RE - enhanced POSIX regex is used. Do not confuse with
// GTEST_HAS_POSIX_RE (see above) which users can
// define themselves.
@@ -231,6 +232,7 @@
// Regular expressions:
// RE - a simple regular expression class using the POSIX
// Extended Regular Expression syntax on UNIX-like platforms
+// GOOGLETEST_CM0008 DO NOT DELETE
// or a reduced regular exception syntax on other
// platforms, including Windows.
// Logging: