diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-08-07 09:12:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 09:12:00 (GMT) |
| commit | e9b05a4d6aa7f471cbb1bd30c3b9792c939de127 (patch) | |
| tree | f38bcb2d7e6ae7353fa09aae5ba59cc3019ae1e8 /googletest/include | |
| parent | 25e1436b087ac2b05a4b5eeb0a2704a53016be2d (diff) | |
| parent | 28b71e444c41ad93225145e029db4957f15aaae6 (diff) | |
| download | googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.zip googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.tar.gz googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index e25ef72..95e3fd6 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -381,7 +381,7 @@ #if GTEST_LANG_CXX11 # define GTEST_HAS_STD_TUPLE_ 1 # if defined(__clang__) -// Inspired by http://clang.llvm.org/docs/LanguageExtensions.html#__has_include +// 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 @@ -393,7 +393,7 @@ # elif defined(__GLIBCXX__) // Inspired by boost/config/stdlib/libstdcpp3.hpp, // http://gcc.gnu.org/gcc-4.2/changes.html and -// http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01.html#manual.intro.status.standard.200x +// https://web.archive.org/web/20140227044429/gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01.html#manual.intro.status.standard.200x # if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) # undef GTEST_HAS_STD_TUPLE_ # endif @@ -1801,7 +1801,7 @@ class GTEST_API_ Mutex { // Initializes owner_thread_id_ and critical_section_ in static mutexes. void ThreadSafeLazyInit(); - // Per http://blogs.msdn.com/b/oldnewthing/archive/2004/02/23/78395.aspx, + // Per https://blogs.msdn.microsoft.com/oldnewthing/20040223-00/?p=40503, // we assume that 0 is an invalid value for thread IDs. unsigned int owner_thread_id_; |