diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-08-01 10:11:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 10:11:18 (GMT) |
| commit | 25e1436b087ac2b05a4b5eeb0a2704a53016be2d (patch) | |
| tree | bf36edd43dcaca6e9588c9c02bcc70527d11c871 /googletest/include/gtest/internal/gtest-string.h | |
| parent | 1ae4fdb79009322d90c304fd49d4fb625b408823 (diff) | |
| parent | 4f160f737078a827f1702e69b5964322ac860598 (diff) | |
| download | googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.zip googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.tar.gz googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to 'googletest/include/gtest/internal/gtest-string.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-string.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-string.h b/googletest/include/gtest/internal/gtest-string.h index 71eb840..1d2436c 100644 --- a/googletest/include/gtest/internal/gtest-string.h +++ b/googletest/include/gtest/internal/gtest-string.h @@ -34,10 +34,11 @@ // Google Test. They are subject to change without notice. They should not used // by code external to Google Test. // -// This header file is #included by -// gtest/internal/gtest-internal.h. +// This header file is #included by gtest-internal.h. // It should not be #included by other files. +// GOOGLETEST_CM0001 DO NOT DELETE + #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ |