diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-05 17:46:09 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-05 17:46:09 +0100 |
| commit | 682f94317f65b9b9694468b41ef5ae29392c5828 (patch) | |
| tree | c463892c34322b5c3b62ed75c2191ae978615dfd /include | |
| parent | f569c4197c8e3d63ddd0e8c1f71cc5a6161b2fe5 (diff) | |
These extern "C" functions are in the global namespace
Change-Id: I75bdb9ac71a3d36eeaf0b846e25d22a0aa923895
Diffstat (limited to 'include')
| -rw-r--r-- | include/com/sun/star/uno/Any.hxx | 9 | ||||
| -rw-r--r-- | include/com/sun/star/uno/Reference.hxx | 13 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx index 9e9e7dcd2455..452893530125 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 456c35fb69ea..1ba4e48d2524 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 ) |