gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Distinguish between C++11 language and library support for <initializer_list>.

Browse Source 
Fix spelling: repositary -> repository.
Pull in gtest 671.
This commit is contained in:
kosak
2013-12-04 23:49:07 +00:00
parent 6414d806cd
commit 18489fa4f8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/gmock/gmock-matchers.h
View File

@@ -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) {