diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-12-04 23:44:22 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-12-04 23:44:22 +0000 |
| commit | 237d7a871eea8c1ef5227795e81ff071f15c2710 (patch) | |
| tree | 6744c4e9cb780f53204650041fdeecf169df9de2 | |
| parent | 2ba84be6837768b0bb204ea9b11b0aee8cb95883 (diff) | |
| download | googletest-237d7a871eea8c1ef5227795e81ff071f15c2710.tar.gz | |
Distinguish between C++11 language and library support for <initializer_list>.
Fix spelling: repositary -> repository.
git-svn-id: http://googletest.googlecode.com/svn/trunk@671 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 8 |
2 files changed, 9 insertions, 1 deletions
@@ -72,7 +72,7 @@ Getting the Source There are two primary ways of getting Google Test's source code: you can download a stable source release in your preferred archive format, -or directly check out the source from our Subversion (SVN) repositary. +or directly check out the source from our Subversion (SVN) repository. The SVN checkout requires a few extra steps and some extra software packages on your system, but lets you track the latest development and make patches much more easily, so we highly encourage it. diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index b5c6446..0b720da 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -282,6 +282,14 @@ # endif #endif +// C++11 specifies that <initializer_list> provides std::initializer_list. Use +// that if gtest is used in C++11 mode and libstdc++ isn't very old (binaries +// targeting OS X 10.6 can build with clang but need to use gcc4.2's +// libstdc++). +#if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325) +# define GTEST_HAS_STD_INITIALIZER_LIST_ 1 +#endif + // Brings in definitions for functions used in the testing::internal::posix // namespace (read, write, close, chdir, isatty, stat). We do not currently // use them on Windows Mobile. |