Merge pull request #1285 from SpecLad:enum-compare

pull/1294/merge
Roman Donchenko 12 years ago committed by OpenCV Buildbot
commit 473ca0849d
  1. 2
      modules/cudev/include/opencv2/cudev/util/type_traits.hpp

@ -152,7 +152,7 @@ template <typename T> struct TypeTraits
template <typename A, typename B> struct LargerType template <typename A, typename B> struct LargerType
{ {
typedef typename SelectIf< typedef typename SelectIf<
VecTraits<A>::cn != VecTraits<B>::cn, unsigned(VecTraits<A>::cn) != unsigned(VecTraits<B>::cn),
void, void,
typename MakeVec< typename MakeVec<
typename type_traits_detail::LargerDepth< typename type_traits_detail::LargerDepth<

Loading…
Cancel
Save