mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-30 01:51:09 +02:00
gmock: pull gcc-4.7 fix from upstream
BUG=None TEST=`emerge-amd64-generic gmock` worked TEST=`emerge-arm-generic gmock` worked TEST=`emerge-x86-generic gmock` worked Change-Id: Iccc6379d5e814ad959d077d78efbf2c6aa4ca364 Reviewed-on: https://gerrit.chromium.org/gerrit/24063 Reviewed-by: Han Shen <shenhan@google.com> Reviewed-by: Han Shen <shenhan@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger
Gerrit
parent
6920d1e8bf
commit
0faa0ebcc3
189
sdk_container/src/third_party/portage-stable/dev-cpp/gmock/files/gmock-1.4.0-gcc-4.7.patch
vendored
Normal file
189
sdk_container/src/third_party/portage-stable/dev-cpp/gmock/files/gmock-1.4.0-gcc-4.7.patch
vendored
Normal file
@ -0,0 +1,189 @@
|
||||
taken from upstream repo
|
||||
|
||||
Index: include/gmock/gmock-generated-function-mockers.h.pump
|
||||
===================================================================
|
||||
--- include/gmock/gmock-generated-function-mockers.h.pump (revision 227)
|
||||
+++ include/gmock/gmock-generated-function-mockers.h.pump (revision 228)
|
||||
@@ -45,10 +45,6 @@ $var n = 10 $$ The maximum arity we sup
|
||||
#include <gmock/internal/gmock-internal-utils.h>
|
||||
|
||||
namespace testing {
|
||||
-
|
||||
-template <typename F>
|
||||
-class MockSpec;
|
||||
-
|
||||
namespace internal {
|
||||
|
||||
template <typename F>
|
||||
@@ -89,7 +85,11 @@ $if i >= 1 [[
|
||||
}
|
||||
|
||||
R Invoke($Aas) {
|
||||
- return InvokeWith(ArgumentTuple($as));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple($as));
|
||||
}
|
||||
};
|
||||
|
||||
Index: include/gmock/gmock-generated-function-mockers.h
|
||||
===================================================================
|
||||
--- include/gmock/gmock-generated-function-mockers.h (revision 227)
|
||||
+++ include/gmock/gmock-generated-function-mockers.h (revision 228)
|
||||
@@ -42,10 +42,6 @@
|
||||
#include <gmock/internal/gmock-internal-utils.h>
|
||||
|
||||
namespace testing {
|
||||
-
|
||||
-template <typename F>
|
||||
-class MockSpec;
|
||||
-
|
||||
namespace internal {
|
||||
|
||||
template <typename F>
|
||||
@@ -71,7 +67,11 @@ class FunctionMocker<R()> : public
|
||||
}
|
||||
|
||||
R Invoke() {
|
||||
- return InvokeWith(ArgumentTuple());
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple());
|
||||
}
|
||||
};
|
||||
|
||||
@@ -88,7 +88,11 @@ class FunctionMocker<R(A1)> : public
|
||||
}
|
||||
|
||||
R Invoke(A1 a1) {
|
||||
- return InvokeWith(ArgumentTuple(a1));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -105,7 +109,11 @@ class FunctionMocker<R(A1, A2)> : public
|
||||
}
|
||||
|
||||
R Invoke(A1 a1, A2 a2) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -123,7 +131,11 @@ class FunctionMocker<R(A1, A2, A3)> : pu
|
||||
}
|
||||
|
||||
R Invoke(A1 a1, A2 a2, A3 a3) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2, a3));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2, a3));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -141,7 +153,11 @@ class FunctionMocker<R(A1, A2, A3, A4)>
|
||||
}
|
||||
|
||||
R Invoke(A1 a1, A2 a2, A3 a3, A4 a4) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2, a3, a4));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -161,7 +177,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
|
||||
}
|
||||
|
||||
R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -182,7 +202,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
|
||||
}
|
||||
|
||||
R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -203,7 +227,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
|
||||
}
|
||||
|
||||
R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -224,7 +252,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
|
||||
}
|
||||
|
||||
R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -246,7 +278,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
|
||||
}
|
||||
|
||||
R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -270,7 +306,12 @@ class FunctionMocker<R(A1, A2, A3, A4, A
|
||||
|
||||
R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
|
||||
A10 a10) {
|
||||
- return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10));
|
||||
+ // Even though gcc and MSVC don't enforce it, 'this->' is required
|
||||
+ // by the C++ standard [14.6.4] here, as the base class type is
|
||||
+ // dependent on the template argument (and thus shouldn't be
|
||||
+ // looked into when resolving InvokeWith).
|
||||
+ return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9,
|
||||
+ a10));
|
||||
}
|
||||
};
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.5.0.ebuild,v 1.2 2011/11/11 20:12:12 vapier Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.3 2012/05/30 20:03:47 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit libtool
|
||||
inherit libtool eutils
|
||||
|
||||
DESCRIPTION="Google's C++ mocking framework"
|
||||
HOMEPAGE="http://code.google.com/p/googlemock/"
|
||||
@ -25,6 +25,7 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gcc-4.7.patch
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
@ -34,5 +35,5 @@ src_configure() {
|
||||
|
||||
src_install() {
|
||||
default
|
||||
use static-libs || find "${D}" -name '*.la' -delete
|
||||
use static-libs || find "${ED}"/usr -name '*.la' -delete
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user