Skip to content

GitLab

Commit 2989703e authored by zhanyong.wan's avatar zhanyong.wan
Browse files

Fixes uses of pair to std::pair; pulls in gtest r655.

parent 616180e6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
include/gmock/gmock-matchers.h
View file @ 2989703e
...@@ -1418,7 +1418,7 @@ class BothOfMatcherImpl : public MatcherInterface<T> { ...@@ -1418,7 +1418,7 @@ class BothOfMatcherImpl : public MatcherInterface<T> {
template <int kSize, typename Head, typename... Tail> template <int kSize, typename Head, typename... Tail>
struct MatcherList { struct MatcherList {
typedef MatcherList<kSize - 1, Tail...> MatcherListTail; 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. // BuildList stores variadic type values in a nested pair structure.
// Example: // Example:
...@@ -1445,11 +1445,11 @@ struct MatcherList { ...@@ -1445,11 +1445,11 @@ struct MatcherList {
// MatcherList. // MatcherList.
template <typename Matcher1, typename Matcher2> template <typename Matcher1, typename Matcher2>
struct MatcherList<2, Matcher1, Matcher2> { struct MatcherList<2, Matcher1, Matcher2> {
typedef pair<Matcher1, Matcher2> ListType; typedef ::std::pair<Matcher1, Matcher2> ListType;
static ListType BuildList(const Matcher1& matcher1, static ListType BuildList(const Matcher1& matcher1,
const Matcher2& matcher2) { const Matcher2& matcher2) {
return pair<Matcher1, Matcher2>(matcher1, matcher2); return ::std::pair<Matcher1, Matcher2>(matcher1, matcher2);
} }
template <typename T, template <typename /* T */> class CombiningMatcher> template <typename T, template <typename /* T */> class CombiningMatcher>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment