Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 946150 | Differences between
and this patch

Collapse All | Expand All

(-)a/modules/cudev/include/opencv2/cudev/ptr2d/zip.hpp (-1 / +4 lines)
Lines 49-55 Link Here
49
#include "../common.hpp"
49
#include "../common.hpp"
50
#include "../util/tuple.hpp"
50
#include "../util/tuple.hpp"
51
#include "traits.hpp"
51
#include "traits.hpp"
52
#if defined(__CUDACC_VER_MAJOR__) && (__CUDACC_VER_MAJOR__ > 12 || (__CUDACC_VER_MAJOR__ == 12 && __CUDACC_VER_MINOR__ >= 4))
52
#include <cuda/std/tuple>
53
#include <cuda/std/tuple>
54
#endif
53
55
54
namespace cv { namespace cudev {
56
namespace cv { namespace cudev {
55
57
Lines 176-181 template <class PtrTuple> struct PtrTraits< ZipPtrSz<PtrTuple> > : PtrTraitsBase Link Here
176
178
177
}}
179
}}
178
180
181
#if defined(__CUDACC_VER_MAJOR__) && (__CUDACC_VER_MAJOR__ > 12 || (__CUDACC_VER_MAJOR__ == 12 && __CUDACC_VER_MINOR__ >= 4))
179
_LIBCUDACXX_BEGIN_NAMESPACE_STD
182
_LIBCUDACXX_BEGIN_NAMESPACE_STD
180
183
181
template< class... Types >
184
template< class... Types >
Lines 198-200 struct tuple_element<N, cv::cudev::ZipPtrSz<tuple<Types...> > > Link Here
198
_LIBCUDACXX_END_NAMESPACE_STD
201
_LIBCUDACXX_END_NAMESPACE_STD
199
202
200
#endif
203
#endif
201
- 
204
#endif

Return to bug 946150