Skip to content

C
core
Kaydet (Commit) 2224ef39 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Any: consistently use explicit specialization instead of overloading 

Should be transparent to client code.

Change-Id: I5632fba87242ff9cb9a6b3481a179fa3e92c618b
üst 8e285728
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 0 deletions
include/com/sun/star/uno/Any.h
Dosyayı görüntüle @ 2224ef39
...@@ -270,6 +270,7 @@ template< class C > ...@@ -270,6 +270,7 @@ template< class C >
inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(()); inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(());
// additionally for C++ bool: // additionally for C++ bool:
template<>
inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
SAL_THROW(()); SAL_THROW(());
...@@ -312,7 +313,9 @@ inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW ...@@ -312,7 +313,9 @@ inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW
// additional specialized >>= and == operators // additional specialized >>= and == operators
// bool // bool
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value ) SAL_THROW(());
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(()); inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(());
template<> template<>
inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
...@@ -321,29 +324,44 @@ template<> ...@@ -321,29 +324,44 @@ template<>
inline bool SAL_CALL operator == ( Any const & rAny, bool const & value ) inline bool SAL_CALL operator == ( Any const & rAny, bool const & value )
SAL_THROW(()); SAL_THROW(());
// byte // byte
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value ) SAL_THROW(());
// short // short
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(());
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(());
// long // long
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(());
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(());
// hyper // hyper
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(());
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(());
// float // float
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(());
// double // double
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(());
// string // string
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(());
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(()); inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(());
// type // type
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(());
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(()); inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(());
// any // any
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(()); inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(());
// interface // interface
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(()); inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(());
} }
......
include/com/sun/star/uno/Any.hxx
Dosyayı görüntüle @ 2224ef39
...@@ -214,6 +214,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(()) ...@@ -214,6 +214,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(())
// additionally for C++ bool: // additionally for C++ bool:
//______________________________________________________________________________ //______________________________________________________________________________
template<>
inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
SAL_THROW(()) SAL_THROW(())
{ {
...@@ -250,6 +251,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(()) ...@@ -250,6 +251,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(())
// bool // bool
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW(())
{ {
if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass) if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass)
...@@ -260,6 +262,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal ...@@ -260,6 +262,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal
return false; return false;
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(()) inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(())
{ {
return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass && return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass &&
...@@ -293,6 +296,7 @@ inline bool SAL_CALL operator == ( Any const & rAny, bool const & value ) ...@@ -293,6 +296,7 @@ inline bool SAL_CALL operator == ( Any const & rAny, bool const & value )
// byte // byte
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW(())
{ {
if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass) if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass)
...@@ -304,6 +308,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal ...@@ -304,6 +308,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal
} }
// short // short
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(())
{ {
switch (rAny.pType->eTypeClass) switch (rAny.pType->eTypeClass)
...@@ -320,6 +325,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_TH ...@@ -320,6 +325,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_TH
} }
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(())
{ {
switch (rAny.pType->eTypeClass) switch (rAny.pType->eTypeClass)
...@@ -337,6 +343,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_T ...@@ -337,6 +343,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_T
} }
// long // long
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(())
{ {
switch (rAny.pType->eTypeClass) switch (rAny.pType->eTypeClass)
...@@ -359,6 +366,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_TH ...@@ -359,6 +366,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_TH
} }
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(())
{ {
switch (rAny.pType->eTypeClass) switch (rAny.pType->eTypeClass)
...@@ -382,6 +390,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_T ...@@ -382,6 +390,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_T
} }
// hyper // hyper
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(())
{ {
switch (rAny.pType->eTypeClass) switch (rAny.pType->eTypeClass)
...@@ -410,6 +419,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_TH ...@@ -410,6 +419,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_TH
} }
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(())
{ {
switch (rAny.pType->eTypeClass) switch (rAny.pType->eTypeClass)
...@@ -439,6 +449,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_T ...@@ -439,6 +449,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_T
} }
// float // float
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(())
{ {
switch (rAny.pType->eTypeClass) switch (rAny.pType->eTypeClass)
...@@ -461,6 +472,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW( ...@@ -461,6 +472,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(
} }
// double // double
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(())
{ {
switch (rAny.pType->eTypeClass) switch (rAny.pType->eTypeClass)
...@@ -492,6 +504,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW ...@@ -492,6 +504,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW
} }
// string // string
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(())
{ {
if (typelib_TypeClass_STRING == rAny.pType->eTypeClass) if (typelib_TypeClass_STRING == rAny.pType->eTypeClass)
...@@ -502,6 +515,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) ...@@ -502,6 +515,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value )
return false; return false;
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(()) inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(())
{ {
return (typelib_TypeClass_STRING == rAny.pType->eTypeClass && return (typelib_TypeClass_STRING == rAny.pType->eTypeClass &&
...@@ -509,6 +523,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & val ...@@ -509,6 +523,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & val
} }
// type // type
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(())
{ {
if (typelib_TypeClass_TYPE == rAny.pType->eTypeClass) if (typelib_TypeClass_TYPE == rAny.pType->eTypeClass)
...@@ -519,6 +534,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(( ...@@ -519,6 +534,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW((
return false; return false;
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(()) inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(())
{ {
return (typelib_TypeClass_TYPE == rAny.pType->eTypeClass && return (typelib_TypeClass_TYPE == rAny.pType->eTypeClass &&
...@@ -526,6 +542,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_TH ...@@ -526,6 +542,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_TH
} }
// any // any
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(()) inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(())
{ {
if (&rAny != &value) if (&rAny != &value)
...@@ -538,6 +555,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(() ...@@ -538,6 +555,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(()
} }
// interface // interface
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(()) inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(())
{ {
if (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass) if (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment