diff options
| author | kosak <kosak@google.com> | 2013-12-04 23:49:07 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2013-12-04 23:49:07 +0000 |
| commit | 18489fa4f81a65ab5f42a6705c28ca2f80eab3bd (patch) | |
| tree | 83ff20f48fbb9a198f4b23e669a41935bcc2e969 /include/gmock | |
| parent | 6414d806cd7d0954cce81348552fdd1e5bd31515 (diff) | |
| download | googletest-18489fa4f81a65ab5f42a6705c28ca2f80eab3bd.tar.gz googletest-18489fa4f81a65ab5f42a6705c28ca2f80eab3bd.tar.bz2 googletest-18489fa4f81a65ab5f42a6705c28ca2f80eab3bd.zip | |
Distinguish between C++11 language and library support for <initializer_list>.
Fix spelling: repositary -> repository.
Pull in gtest 671.
Diffstat (limited to 'include/gmock')
| -rw-r--r-- | include/gmock/gmock-matchers.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h index 979b0e85..5e2a8d5c 100644 --- a/include/gmock/gmock-matchers.h +++ b/include/gmock/gmock-matchers.h @@ -52,8 +52,8 @@ #include "gmock/internal/gmock-port.h" #include "gtest/gtest.h" -#if GTEST_LANG_CXX11 -#include <initializer_list> // NOLINT -- must be after gtest.h +#if GTEST_HAS_STD_INITIALIZER_LIST_ +# include <initializer_list> // NOLINT -- must be after gtest.h #endif namespace testing { @@ -3350,7 +3350,7 @@ inline internal::ElementsAreArrayMatcher<T> ElementsAreArray( return ElementsAreArray(vec.begin(), vec.end()); } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_INITIALIZER_LIST_ template <typename T> inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(::std::initializer_list<T> xs) { @@ -3392,7 +3392,7 @@ UnorderedElementsAreArray(const ::std::vector<T, A>& vec) { return UnorderedElementsAreArray(vec.begin(), vec.end()); } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_INITIALIZER_LIST_ template <typename T> inline internal::UnorderedElementsAreArrayMatcher<T> UnorderedElementsAreArray(::std::initializer_list<T> xs) { |