diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2013-06-20 18:59:15 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2013-06-20 18:59:15 +0000 |
| commit | 2989703ed85154ae7ef90e0d754590116ecb565d (patch) | |
| tree | 244c4cf1eab0f1938511e9a7af73d95d5ab7d6dd | |
| parent | 616180e6847dd3cc6517a59ff2d24e9fd5c8052c (diff) | |
| download | googletest-2989703ed85154ae7ef90e0d754590116ecb565d.tar.gz googletest-2989703ed85154ae7ef90e0d754590116ecb565d.tar.bz2 googletest-2989703ed85154ae7ef90e0d754590116ecb565d.zip | |
Fixes uses of pair to std::pair; pulls in gtest r655.
| -rw-r--r-- | include/gmock/gmock-matchers.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h index 0512ef44..247b19ae 100644 --- a/include/gmock/gmock-matchers.h +++ b/include/gmock/gmock-matchers.h @@ -1418,7 +1418,7 @@ class BothOfMatcherImpl : public MatcherInterface<T> { template <int kSize, typename Head, typename... Tail> struct MatcherList { typedef MatcherList<kSize - 1, Tail...> MatcherListTail; - typedef pair<Head, typename MatcherListTail::ListType> ListType; + typedef ::std::pair<Head, typename MatcherListTail::ListType> ListType; // BuildList stores variadic type values in a nested pair structure. // Example: @@ -1445,11 +1445,11 @@ struct MatcherList { // MatcherList. template <typename Matcher1, typename Matcher2> struct MatcherList<2, Matcher1, Matcher2> { - typedef pair<Matcher1, Matcher2> ListType; + typedef ::std::pair<Matcher1, Matcher2> ListType; static ListType BuildList(const Matcher1& matcher1, const Matcher2& matcher2) { - return pair<Matcher1, Matcher2>(matcher1, matcher2); + return ::std::pair<Matcher1, Matcher2>(matcher1, matcher2); } template <typename T, template <typename /* T */> class CombiningMatcher> |