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/gtest/internal | |
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/gtest/internal')
-rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 |