diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-08-09 08:58:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 08:58:22 (GMT) |
| commit | efe27ac05c66c3fafad0ac0d279543f640ab30f7 (patch) | |
| tree | 16176eb282cf59332274120eb3b5d53da3f233e2 /googletest/include | |
| parent | e9b05a4d6aa7f471cbb1bd30c3b9792c939de127 (diff) | |
| parent | 4de57ce787989d821d0736c5a12188eeaea3bf2d (diff) | |
| download | googletest-efe27ac05c66c3fafad0ac0d279543f640ab30f7.zip googletest-efe27ac05c66c3fafad0ac0d279543f640ab30f7.tar.gz googletest-efe27ac05c66c3fafad0ac0d279543f640ab30f7.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/gtest-death-test.h | 2 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest-death-test.h b/googletest/include/gtest/gtest-death-test.h index 8add8c0..59795e3 100644 --- a/googletest/include/gtest/gtest-death-test.h +++ b/googletest/include/gtest/gtest-death-test.h @@ -100,6 +100,7 @@ GTEST_API_ bool InDeathTestChild(); // // On the regular expressions used in death tests: // +// GOOGLETEST_CM0005 DO NOT DELETE // On POSIX-compliant systems (*nix), we use the <regex.h> library, // which uses the POSIX extended regex syntax. // @@ -202,6 +203,7 @@ class GTEST_API_ ExitedWithCode { # if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA // Tests that an exit code describes an exit due to termination by a // given signal. +// GOOGLETEST_CM0006 DO NOT DELETE class GTEST_API_ KilledBySignal { public: explicit KilledBySignal(int signum); diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 95e3fd6..0f1b285 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -381,7 +381,8 @@ #if GTEST_LANG_CXX11 # define GTEST_HAS_STD_TUPLE_ 1 # if defined(__clang__) -// Inspired by https://clang.llvm.org/docs/LanguageExtensions.html#include-file-checking-macros +// Inspired by +// https://clang.llvm.org/docs/LanguageExtensions.html#include-file-checking-macros # if defined(__has_include) && !__has_include(<tuple>) # undef GTEST_HAS_STD_TUPLE_ # endif |