Date: Sat, 5 Oct 2013 20:34:59 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329501 - head/graphics/opencv/files Message-ID: <201310052034.r95KYxBd026904@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sat Oct 5 20:34:59 2013 New Revision: 329501 URL: http://svnweb.freebsd.org/changeset/ports/329501 Log: - Fix build on 8.4 Submitted by: bapt mostly, I just fixed up the __has_include bit with help from help from antoine@ Approved by: portmgr (bapt@) Modified: head/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h Modified: head/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h ============================================================================== --- head/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h Sat Oct 5 20:33:02 2013 (r329500) +++ head/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h Sat Oct 5 20:34:59 2013 (r329501) @@ -1,5 +1,5 @@ ---- ./modules/ts/include/opencv2/ts/ts_gtest.h.orig 2013-09-01 01:03:57.000000000 +0100 -+++ ./modules/ts/include/opencv2/ts/ts_gtest.h 2013-09-01 01:03:38.000000000 +0100 +--- modules/ts/include/opencv2/ts/ts_gtest.h.orig 2013-10-05 20:21:38.114793865 +0000 ++++ modules/ts/include/opencv2/ts/ts_gtest.h 2013-10-05 20:21:32.318782942 +0000 @@ -53,6 +53,7 @@ #include <limits> @@ -17,15 +17,17 @@ #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ -@@ -1504,11 +1505,31 @@ +@@ -1504,11 +1505,35 @@ // <tr1/functional>. Hence the following #define is a hack to prevent // <tr1/functional> from being included. #define _TR1_FUNCTIONAL 1 ++#ifdef __clang__ +#if __has_include(<tuple>) +#include <tuple> +namespace gtest { + using ::std::tuple; +} ++#endif +#else #include <tr1/tuple> +namespace gtest { @@ -36,11 +38,13 @@ // <tr1/functional> if he chooses to. #else -#include <tr1/tuple> // NOLINT ++#if defined(__clang__) +#if __has_include(<tuple>) +#include <tuple> +namespace gtest { + using ::std::tuple; +} ++#endif +#else +#include <tr1/tuple> +namespace gtest { @@ -50,7 +54,7 @@ #endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 #else -@@ -11951,9 +11972,9 @@ +@@ -11951,9 +11976,9 @@ // template <typename T1, typename T2> class CartesianProductGenerator2 @@ -62,7 +66,7 @@ CartesianProductGenerator2(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2) -@@ -12066,9 +12087,9 @@ +@@ -12066,9 +12091,9 @@ template <typename T1, typename T2, typename T3> class CartesianProductGenerator3 @@ -74,7 +78,7 @@ CartesianProductGenerator3(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3) -@@ -12198,9 +12219,9 @@ +@@ -12198,9 +12223,9 @@ template <typename T1, typename T2, typename T3, typename T4> class CartesianProductGenerator4 @@ -86,7 +90,7 @@ CartesianProductGenerator4(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3, -@@ -12349,9 +12370,9 @@ +@@ -12349,9 +12374,9 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5> class CartesianProductGenerator5 @@ -98,7 +102,7 @@ CartesianProductGenerator5(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3, -@@ -12517,10 +12538,10 @@ +@@ -12517,10 +12542,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> class CartesianProductGenerator6 @@ -111,7 +115,7 @@ CartesianProductGenerator6(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3, -@@ -12703,10 +12724,10 @@ +@@ -12703,10 +12728,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> class CartesianProductGenerator7 @@ -124,7 +128,7 @@ CartesianProductGenerator7(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3, -@@ -12906,10 +12927,10 @@ +@@ -12906,10 +12931,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> class CartesianProductGenerator8 @@ -137,7 +141,7 @@ CartesianProductGenerator8(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3, -@@ -13128,10 +13149,10 @@ +@@ -13128,10 +13153,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9> class CartesianProductGenerator9 @@ -150,7 +154,7 @@ CartesianProductGenerator9(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3, -@@ -13367,10 +13388,10 @@ +@@ -13367,10 +13392,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10> class CartesianProductGenerator10 @@ -163,7 +167,7 @@ CartesianProductGenerator10(const ParamGenerator<T1>& g1, const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3, -@@ -13632,8 +13653,8 @@ +@@ -13632,8 +13657,8 @@ CartesianProductHolder2(const Generator1& g1, const Generator2& g2) : g1_(g1), g2_(g2) {} template <typename T1, typename T2> @@ -174,7 +178,7 @@ new CartesianProductGenerator2<T1, T2>( static_cast<ParamGenerator<T1> >(g1_), static_cast<ParamGenerator<T2> >(g2_))); -@@ -13654,8 +13675,8 @@ +@@ -13654,8 +13679,8 @@ const Generator3& g3) : g1_(g1), g2_(g2), g3_(g3) {} template <typename T1, typename T2, typename T3> @@ -185,7 +189,7 @@ new CartesianProductGenerator3<T1, T2, T3>( static_cast<ParamGenerator<T1> >(g1_), static_cast<ParamGenerator<T2> >(g2_), -@@ -13679,8 +13700,8 @@ +@@ -13679,8 +13704,8 @@ const Generator3& g3, const Generator4& g4) : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {} template <typename T1, typename T2, typename T3, typename T4> @@ -196,7 +200,7 @@ new CartesianProductGenerator4<T1, T2, T3, T4>( static_cast<ParamGenerator<T1> >(g1_), static_cast<ParamGenerator<T2> >(g2_), -@@ -13706,8 +13727,8 @@ +@@ -13706,8 +13731,8 @@ const Generator3& g3, const Generator4& g4, const Generator5& g5) : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {} template <typename T1, typename T2, typename T3, typename T4, typename T5> @@ -207,7 +211,7 @@ new CartesianProductGenerator5<T1, T2, T3, T4, T5>( static_cast<ParamGenerator<T1> >(g1_), static_cast<ParamGenerator<T2> >(g2_), -@@ -13737,8 +13758,8 @@ +@@ -13737,8 +13762,8 @@ : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {} template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> @@ -218,7 +222,7 @@ new CartesianProductGenerator6<T1, T2, T3, T4, T5, T6>( static_cast<ParamGenerator<T1> >(g1_), static_cast<ParamGenerator<T2> >(g2_), -@@ -13770,9 +13791,9 @@ +@@ -13770,9 +13795,9 @@ : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {} template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> @@ -230,7 +234,7 @@ new CartesianProductGenerator7<T1, T2, T3, T4, T5, T6, T7>( static_cast<ParamGenerator<T1> >(g1_), static_cast<ParamGenerator<T2> >(g2_), -@@ -13808,9 +13829,9 @@ +@@ -13808,9 +13833,9 @@ g8_(g8) {} template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> @@ -242,7 +246,7 @@ new CartesianProductGenerator8<T1, T2, T3, T4, T5, T6, T7, T8>( static_cast<ParamGenerator<T1> >(g1_), static_cast<ParamGenerator<T2> >(g2_), -@@ -13849,9 +13870,9 @@ +@@ -13849,9 +13874,9 @@ g9_(g9) {} template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9> @@ -254,7 +258,7 @@ T9> >( new CartesianProductGenerator9<T1, T2, T3, T4, T5, T6, T7, T8, T9>( static_cast<ParamGenerator<T1> >(g1_), -@@ -13893,9 +13914,9 @@ +@@ -13893,9 +13918,9 @@ g9_(g9), g10_(g10) {} template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310052034.r95KYxBd026904>