diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-03 16:05:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 16:05:07 (GMT) |
| commit | 61f949387e1bb1cad4bf551f291d861214fb251c (patch) | |
| tree | 3e85511dcf48820748441c079c57644ac51be4d9 /googletest/include | |
| parent | 6269264dfec89ebcbcdd1b9e38f2b44277c903b6 (diff) | |
| parent | e887b03e5a1f6095a2cd08c28db8a63d4c016231 (diff) | |
| download | googletest-61f949387e1bb1cad4bf551f291d861214fb251c.zip googletest-61f949387e1bb1cad4bf551f291d861214fb251c.tar.gz googletest-61f949387e1bb1cad4bf551f291d861214fb251c.tar.bz2 | |
Merge branch 'master' into deprecate
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 497fc29..850f876 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -397,7 +397,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 @@ -409,7 +409,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 @@ -1817,7 +1817,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_; |