diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-10-31 15:30:04 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-10-31 15:30:04 +0000 |
| commit | c5854fe3e18c0fcd4b7873330008b39c2c5aa406 (patch) | |
| tree | 5bc60497fa0fbe76b41d727e9babaceeec340147 /biology/ugene/files/patch-gtest-std::tr1::tuple-fix | |
| parent | - Update to 0.037 (diff) | |
- Update to version 1.12.3
- Conditionalize dependency on `devel/libexecinfo'
- Try to detect SSE2 support
- Convert to USES=qmake and stafigy
- Improve grammar in port description while here
Approved by: maintainer (implicit)
Notes
Notes:
svn path=/head/; revision=332256
Diffstat (limited to 'biology/ugene/files/patch-gtest-std::tr1::tuple-fix')
| -rw-r--r-- | biology/ugene/files/patch-gtest-std::tr1::tuple-fix | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/biology/ugene/files/patch-gtest-std::tr1::tuple-fix b/biology/ugene/files/patch-gtest-std::tr1::tuple-fix new file mode 100644 index 000000000000..655f6c86d153 --- /dev/null +++ b/biology/ugene/files/patch-gtest-std::tr1::tuple-fix @@ -0,0 +1,34 @@ +commit 23699acca083589be9dc3b6e8e5c5d09f654648d +Author: marina.kolpakova <marina.kolpakova@itseez.com> +Date: Mon Oct 8 02:37:22 2012 +0400 + + fix for bug 2264 + + fix compilation OpenCV with cxx11 under Ubuntu with clang and gcc 4.7 + +diff --git a/modules/ts/include/opencv2/ts/ts_gtest.h b/modules/ts/include/opencv2/ts/ts_gtest.h +index f98f71b..42eb608 100644 +--- src/libs_3rdparty/gtest/src/gtest/internal/gtest-port.h.orig ++++ src/libs_3rdparty/gtest/src/gtest/internal/gtest-port.h +@@ -1654,7 +1654,21 @@ inline bool operator!=(const GTEST_10_TUPLE_(T)& t, + # undef _TR1_FUNCTIONAL // Allows the user to #include + // <tr1/functional> if he chooses to. + # else ++# if defined (__cplusplus) && __cplusplus > 199711L ++# include <tuple> ++namespace std { ++ namespace tr1 { ++ using std::tuple; ++ using std::tuple_element; ++ using std::get; ++ using std::tuple_size; ++ using std::make_tuple; ++ } ++} ++# else + # include <tr1/tuple> // NOLINT ++# endif ++ + # endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 + + # else |
