diff options
Diffstat (limited to 'basebmp/inc/basebmp/metafunctions.hxx')
| -rw-r--r-- | basebmp/inc/basebmp/metafunctions.hxx | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx index 5f9f8a7ebf31..bdd6b668aeb9 100644 --- a/basebmp/inc/basebmp/metafunctions.hxx +++ b/basebmp/inc/basebmp/metafunctions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,17 +33,15 @@ #include <vigra/metaprogramming.hxx> #include <vigra/numerictraits.hxx> -#include <functional> - namespace basebmp { -// TODO(Q3): move to generic place (o3tl?) +// TODO(Q3): move to generic place (o3tl?) /** template meta function: add const qualifier to 2nd type, if given 1st type has it */ -template<typename A, typename B> struct clone_const +template<typename A, typename B> struct clone_const { typedef B type; }; @@ -55,7 +53,7 @@ template<typename A, typename B> struct clone_const<const A,B> /** template meta function: add const qualifier to plain type (if not already there) */ -template <typename T> struct add_const +template <typename T> struct add_const { typedef const T type; }; @@ -65,7 +63,7 @@ template <typename T> struct add_const<const T> }; /// template meta function: remove const qualifier from plain type -template <typename T> struct remove_const +template <typename T> struct remove_const { typedef T type; }; @@ -137,10 +135,10 @@ inline bool is_negative( int x ) template< typename T, typename trueCase, typename falseCase > struct ifScalarIntegral { - typedef - typename vigra::If< + typedef + typename vigra::If< typename vigra::NumericTraits< T >::isIntegral, - typename vigra::If< + typename vigra::If< typename vigra::NumericTraits< T >::isScalar, trueCase, falseCase >::type, @@ -151,11 +149,11 @@ struct ifScalarIntegral template< typename T, typename trueCase, typename falseCase > struct ifScalarNonIntegral { - typedef - typename vigra::If< + typedef + typename vigra::If< typename vigra::NumericTraits< T >::isIntegral, falseCase, - typename vigra::If< + typename vigra::If< typename vigra::NumericTraits< T >::isScalar, trueCase, falseCase >::type >::type type; @@ -165,11 +163,11 @@ struct ifScalarNonIntegral template< typename T1, typename T2, typename trueCase, typename falseCase > struct ifBothScalarIntegral { - typedef - typename ifScalarIntegral< - T1, - typename ifScalarIntegral< - T2, + typedef + typename ifScalarIntegral< + T1, + typename ifScalarIntegral< + T2, trueCase, falseCase >::type, falseCase >::type type; @@ -193,7 +191,7 @@ template<> struct numberOfTrailingZeros<0> //-------------------------------------------------------------- -/// Count number of one bits +/// Count number of one bits template< unsigned int val > struct bitcount { enum { next = val >> 1 }; @@ -207,26 +205,18 @@ template<> struct bitcount<0> //-------------------------------------------------------------- -/// Shift left for positive shift value, and right otherwise +/// Shift left for positive shift value, and right otherwise template< typename T > inline T shiftLeft( T v, int shift ) { return shift > 0 ? v << shift : v >> (-shift); } -/// Shift right for positive shift value, and left otherwise +/// Shift right for positive shift value, and left otherwise template< typename T > inline T shiftRight( T v, int shift ) { return shift > 0 ? v >> shift : v << (-shift); } -//-------------------------------------------------------------- - -/// Replace non-std project2nd from SGI extensions -template< typename T1, typename T2 > -struct project2nd : public std::binary_function<T1, T2, T2> -{ - T2 operator() (const T1&, const T2& v) const { return v; } -}; } // namespace basebmp |