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

Fix spelling: repositary -> repository.
Pull in gtest 671.
pull/511/head
kosak 12 years ago
parent 6414d806cd
commit 18489fa4f8
  1. 4
      README
  2. 6
      include/gmock/gmock-matchers.h
  3. 4
      test/gmock-generated-matchers_test.cc
  4. 4
      test/gmock-matchers_test.cc

@ -42,7 +42,7 @@ Requirements for End Users
Google Mock is implemented on top of the Google Test C++ testing
framework (http://code.google.com/p/googletest/), and includes the
latter as part of the SVN repositary and distribution package. You
latter as part of the SVN repository and distribution package. You
must use the bundled version of Google Test when using Google Mock, or
you may get compiler/linker errors.
@ -92,7 +92,7 @@ Getting the Source
There are two primary ways of getting Google Mock'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 development and make
patches much more easily, so we highly encourage it.

@ -52,7 +52,7 @@
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
#if GTEST_LANG_CXX11
#if GTEST_HAS_STD_INITIALIZER_LIST_
# include <initializer_list> // NOLINT -- must be after gtest.h
#endif
@ -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) {

@ -630,7 +630,7 @@ TEST(ElementsAreArrayTest, CanBeCreatedWithVector) {
EXPECT_THAT(test_vector, Not(ElementsAreArray(expected)));
}
#if GTEST_LANG_CXX11
#if GTEST_HAS_STD_INITIALIZER_LIST_
TEST(ElementsAreArrayTest, TakesInitializerList) {
const int a[5] = { 1, 2, 3, 4, 5 };
@ -666,7 +666,7 @@ TEST(ElementsAreArrayTest,
{ Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) })));
}
#endif // GTEST_LANG_CXX11
#endif // GTEST_HAS_STD_INITIALIZER_LIST_
TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherVector) {
const int a[] = { 1, 2, 3 };

@ -4503,7 +4503,7 @@ TEST(UnorderedElementsAreArrayTest, WorksForStreamlike) {
EXPECT_THAT(s, Not(UnorderedElementsAreArray(expected)));
}
#if GTEST_LANG_CXX11
#if GTEST_HAS_STD_INITIALIZER_LIST_
TEST(UnorderedElementsAreArrayTest, TakesInitializerList) {
const int a[5] = { 2, 1, 4, 5, 3 };
@ -4537,7 +4537,7 @@ TEST(UnorderedElementsAreArrayTest,
{ Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) })));
}
#endif // GTEST_LANG_CXX11
#endif // GTEST_HAS_STD_INITIALIZER_LIST_
class UnorderedElementsAreTest : public testing::Test {
protected:

Loading…
Cancel
Save