diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-17 15:48:56 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 15:48:56 (GMT) |
commit | a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d (patch) | |
tree | 32d0dac55ff598f9732ff57581044eabd24fa807 /googletest/include/gtest/internal/gtest-string.h | |
parent | 421e7b4f29fc761c66d2773a1fc318a738a6d3da (diff) | |
parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
download | googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.zip googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.gz googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.bz2 |
Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/head
Diffstat (limited to 'googletest/include/gtest/internal/gtest-string.h')
-rw-r--r-- | googletest/include/gtest/internal/gtest-string.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-string.h b/googletest/include/gtest/internal/gtest-string.h index 71eb840..4c9b626 100644 --- a/googletest/include/gtest/internal/gtest-string.h +++ b/googletest/include/gtest/internal/gtest-string.h @@ -27,17 +27,17 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// // The Google C++ Testing and Mocking Framework (Google Test) // // This header file declares the String class and functions used internally by // 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_ |