diff options
author | Loo Rong Jie <loorongjie@gmail.com> | 2018-08-09 12:08:44 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-09 12:08:44 (GMT) |
commit | 24786cb498231a441fc8f50400272b8868d3610d (patch) | |
tree | 5e6ae62f4e4e4994bfa43fbe6634f6b4dbb9ce73 /googletest/include/gtest/internal/gtest-port.h | |
parent | 61f949387e1bb1cad4bf551f291d861214fb251c (diff) | |
parent | 4de57ce787989d821d0736c5a12188eeaea3bf2d (diff) | |
download | googletest-24786cb498231a441fc8f50400272b8868d3610d.zip googletest-24786cb498231a441fc8f50400272b8868d3610d.tar.gz googletest-24786cb498231a441fc8f50400272b8868d3610d.tar.bz2 |
Merge branch 'master' into deprecate
Diffstat (limited to 'googletest/include/gtest/internal/gtest-port.h')
-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 850f876..db5f1cd 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -397,7 +397,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 |