include/com/sun/star/uno/Any.hxx | 9 ++++----- include/com/sun/star/uno/Reference.hxx | 13 +++++++------ 2 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 682f94317f65b9b9694468b41ef5ae29392c5828 Author: Stephan Bergmann <[email protected]> Date: Mon Jan 5 17:46:09 2015 +0100 These extern "C" functions are in the global namespace Change-Id: I75bdb9ac71a3d36eeaf0b846e25d22a0aa923895 diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx index 9e9e7dc..4528935 100644 --- a/include/com/sun/star/uno/Any.hxx +++ b/include/com/sun/star/uno/Any.hxx @@ -35,6 +35,10 @@ #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> +extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg( + uno_Any const * pAny, typelib_TypeDescriptionReference * pType ) + SAL_THROW_EXTERN_C(); + namespace com { namespace sun @@ -577,11 +581,6 @@ inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) return (! operator == ( rAny, value )); } -extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg( - uno_Any const * pAny, typelib_TypeDescriptionReference * pType ) - SAL_THROW_EXTERN_C(); - - template <typename T> T Any::get() const { diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx index 456c35f..1ba4e48 100644 --- a/include/com/sun/star/uno/Reference.hxx +++ b/include/com/sun/star/uno/Reference.hxx @@ -25,6 +25,13 @@ #include <com/sun/star/uno/Any.hxx> #include <cppu/cppudllapi.h> +extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( + typelib_TypeDescriptionReference * pType ) + SAL_THROW_EXTERN_C(); +extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( + typelib_TypeDescriptionReference * pType ) + SAL_THROW_EXTERN_C(); + namespace com { namespace sun @@ -57,12 +64,6 @@ inline XInterface * Reference< interface_type >::iquery( { return BaseReference::iquery(pInterface, interface_type::static_type()); } -extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( - typelib_TypeDescriptionReference * pType ) - SAL_THROW_EXTERN_C(); -extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( - typelib_TypeDescriptionReference * pType ) - SAL_THROW_EXTERN_C(); inline XInterface * BaseReference::iquery_throw( XInterface * pInterface, const Type & rType ) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
