mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-19 17:41:33 +01:00
Upgraded the gmock Portage package (manually, not using cros_portage_upgrade).
Upgraded dev-cpp/gmock to version 1.4.0 on amd64, arm, x86 BUG=None TEST=`emerge-amd64-generic gmock` worked TEST=`emerge-arm-generic gmock` worked TEST=`emerge-x86-generic gmock` worked Change-Id: I8f12bddf4498556ec560e6073b946708b09e596b Reviewed-on: https://gerrit.chromium.org/gerrit/31756 Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: Han Shen <shenhan@chromium.org> Tested-by: Han Shen <shenhan@chromium.org>
This commit is contained in:
Han Shen
Gerrit
parent
5c55b4408d
commit
2a524ceee6
144
sdk_container/src/third_party/portage-stable/dev-cpp/gmock/files/gmock-1.4.0-more-gcc-4.7.patch
vendored
Normal file
144
sdk_container/src/third_party/portage-stable/dev-cpp/gmock/files/gmock-1.4.0-more-gcc-4.7.patch
vendored
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
taken from upstream repo
|
||||||
|
|
||||||
|
------------------------------------------------------------------------
|
||||||
|
r245 | zhanyong.wan | 2009-12-02 03:36:42 -0500 (Wed, 02 Dec 2009) | 2 lines
|
||||||
|
|
||||||
|
Fixes a C++-standard-compliance bug in gmock-printers.h.
|
||||||
|
|
||||||
|
|
||||||
|
Index: include/gmock/gmock-printers.h
|
||||||
|
===================================================================
|
||||||
|
--- include/gmock/gmock-printers.h (revision 244)
|
||||||
|
+++ include/gmock/gmock-printers.h (revision 245)
|
||||||
|
@@ -434,63 +434,10 @@ inline void PrintTo(const ::std::wstring
|
||||||
|
// Overload for ::std::tr1::tuple. Needed for printing function
|
||||||
|
// arguments, which are packed as tuples.
|
||||||
|
|
||||||
|
-typedef ::std::vector<string> Strings;
|
||||||
|
-
|
||||||
|
-// This helper template allows PrintTo() for tuples and
|
||||||
|
-// UniversalTersePrintTupleFieldsToStrings() to be defined by
|
||||||
|
-// induction on the number of tuple fields. The idea is that
|
||||||
|
-// TuplePrefixPrinter<N>::PrintPrefixTo(t, os) prints the first N
|
||||||
|
-// fields in tuple t, and can be defined in terms of
|
||||||
|
-// TuplePrefixPrinter<N - 1>.
|
||||||
|
-
|
||||||
|
-// The inductive case.
|
||||||
|
-template <size_t N>
|
||||||
|
-struct TuplePrefixPrinter {
|
||||||
|
- // Prints the first N fields of a tuple.
|
||||||
|
- template <typename Tuple>
|
||||||
|
- static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
|
||||||
|
- TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
|
||||||
|
- *os << ", ";
|
||||||
|
- UniversalPrinter<typename ::std::tr1::tuple_element<N - 1, Tuple>::type>
|
||||||
|
- ::Print(::std::tr1::get<N - 1>(t), os);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- // Tersely prints the first N fields of a tuple to a string vector,
|
||||||
|
- // one element for each field.
|
||||||
|
- template <typename Tuple>
|
||||||
|
- static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
|
||||||
|
- TuplePrefixPrinter<N - 1>::TersePrintPrefixToStrings(t, strings);
|
||||||
|
- ::std::stringstream ss;
|
||||||
|
- UniversalTersePrint(::std::tr1::get<N - 1>(t), &ss);
|
||||||
|
- strings->push_back(ss.str());
|
||||||
|
- }
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-// Base cases.
|
||||||
|
-template <>
|
||||||
|
-struct TuplePrefixPrinter<0> {
|
||||||
|
- template <typename Tuple>
|
||||||
|
- static void PrintPrefixTo(const Tuple&, ::std::ostream*) {}
|
||||||
|
-
|
||||||
|
- template <typename Tuple>
|
||||||
|
- static void TersePrintPrefixToStrings(const Tuple&, Strings*) {}
|
||||||
|
-};
|
||||||
|
-template <>
|
||||||
|
-template <typename Tuple>
|
||||||
|
-void TuplePrefixPrinter<1>::PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
|
||||||
|
- UniversalPrinter<typename ::std::tr1::tuple_element<0, Tuple>::type>::
|
||||||
|
- Print(::std::tr1::get<0>(t), os);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
// Helper function for printing a tuple. T must be instantiated with
|
||||||
|
// a tuple type.
|
||||||
|
template <typename T>
|
||||||
|
-void PrintTupleTo(const T& t, ::std::ostream* os) {
|
||||||
|
- *os << "(";
|
||||||
|
- TuplePrefixPrinter< ::std::tr1::tuple_size<T>::value>::
|
||||||
|
- PrintPrefixTo(t, os);
|
||||||
|
- *os << ")";
|
||||||
|
-}
|
||||||
|
+void PrintTupleTo(const T& t, ::std::ostream* os);
|
||||||
|
|
||||||
|
// Overloaded PrintTo() for tuples of various arities. We support
|
||||||
|
// tuples of up-to 10 fields. The following implementation works
|
||||||
|
@@ -725,6 +672,64 @@ void UniversalPrint(const T& value, ::st
|
||||||
|
UniversalPrinter<T>::Print(value, os);
|
||||||
|
}
|
||||||
|
|
||||||
|
+typedef ::std::vector<string> Strings;
|
||||||
|
+
|
||||||
|
+// This helper template allows PrintTo() for tuples and
|
||||||
|
+// UniversalTersePrintTupleFieldsToStrings() to be defined by
|
||||||
|
+// induction on the number of tuple fields. The idea is that
|
||||||
|
+// TuplePrefixPrinter<N>::PrintPrefixTo(t, os) prints the first N
|
||||||
|
+// fields in tuple t, and can be defined in terms of
|
||||||
|
+// TuplePrefixPrinter<N - 1>.
|
||||||
|
+
|
||||||
|
+// The inductive case.
|
||||||
|
+template <size_t N>
|
||||||
|
+struct TuplePrefixPrinter {
|
||||||
|
+ // Prints the first N fields of a tuple.
|
||||||
|
+ template <typename Tuple>
|
||||||
|
+ static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
|
||||||
|
+ TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
|
||||||
|
+ *os << ", ";
|
||||||
|
+ UniversalPrinter<typename ::std::tr1::tuple_element<N - 1, Tuple>::type>
|
||||||
|
+ ::Print(::std::tr1::get<N - 1>(t), os);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Tersely prints the first N fields of a tuple to a string vector,
|
||||||
|
+ // one element for each field.
|
||||||
|
+ template <typename Tuple>
|
||||||
|
+ static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
|
||||||
|
+ TuplePrefixPrinter<N - 1>::TersePrintPrefixToStrings(t, strings);
|
||||||
|
+ ::std::stringstream ss;
|
||||||
|
+ UniversalTersePrint(::std::tr1::get<N - 1>(t), &ss);
|
||||||
|
+ strings->push_back(ss.str());
|
||||||
|
+ }
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+// Base cases.
|
||||||
|
+template <>
|
||||||
|
+struct TuplePrefixPrinter<0> {
|
||||||
|
+ template <typename Tuple>
|
||||||
|
+ static void PrintPrefixTo(const Tuple&, ::std::ostream*) {}
|
||||||
|
+
|
||||||
|
+ template <typename Tuple>
|
||||||
|
+ static void TersePrintPrefixToStrings(const Tuple&, Strings*) {}
|
||||||
|
+};
|
||||||
|
+template <>
|
||||||
|
+template <typename Tuple>
|
||||||
|
+void TuplePrefixPrinter<1>::PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
|
||||||
|
+ UniversalPrinter<typename ::std::tr1::tuple_element<0, Tuple>::type>::
|
||||||
|
+ Print(::std::tr1::get<0>(t), os);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+// Helper function for printing a tuple. T must be instantiated with
|
||||||
|
+// a tuple type.
|
||||||
|
+template <typename T>
|
||||||
|
+void PrintTupleTo(const T& t, ::std::ostream* os) {
|
||||||
|
+ *os << "(";
|
||||||
|
+ TuplePrefixPrinter< ::std::tr1::tuple_size<T>::value>::
|
||||||
|
+ PrintPrefixTo(t, os);
|
||||||
|
+ *os << ")";
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
// Prints the fields of a tuple tersely to a string vector, one
|
||||||
|
// element for each field. See the comment before
|
||||||
|
// UniversalTersePrint() for how we define "tersely".
|
||||||
|
|
||||||
|
------------------------------------------------------------------------
|
||||||
@ -1,6 +1,6 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.3 2012/05/30 20:03:47 vapier Exp $
|
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.6 2012/08/28 21:52:08 vapier Exp $
|
||||||
|
|
||||||
EAPI="4"
|
EAPI="4"
|
||||||
|
|
||||||
@ -26,6 +26,7 @@ src_unpack() {
|
|||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
epatch "${FILESDIR}"/${P}-gcc-4.7.patch
|
epatch "${FILESDIR}"/${P}-gcc-4.7.patch
|
||||||
|
epatch "${FILESDIR}"/${P}-more-gcc-4.7.patch
|
||||||
elibtoolize
|
elibtoolize
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user