Kaydet (Commit) 682f9431 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

These extern "C" functions are in the global namespace

Change-Id: I75bdb9ac71a3d36eeaf0b846e25d22a0aa923895
üst f569c419
...@@ -35,6 +35,10 @@ ...@@ -35,6 +35,10 @@
#include <cppu/cppudllapi.h> #include <cppu/cppudllapi.h>
#include <cppu/unotype.hxx> #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 com
{ {
namespace sun namespace sun
...@@ -577,11 +581,6 @@ inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) ...@@ -577,11 +581,6 @@ inline bool SAL_CALL operator != ( const Any & rAny, const C & value )
return (! operator == ( rAny, 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> template <typename T>
T Any::get() const T Any::get() const
{ {
......
...@@ -25,6 +25,13 @@ ...@@ -25,6 +25,13 @@
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include <cppu/cppudllapi.h> #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 com
{ {
namespace sun namespace sun
...@@ -57,12 +64,6 @@ inline XInterface * Reference< interface_type >::iquery( ...@@ -57,12 +64,6 @@ inline XInterface * Reference< interface_type >::iquery(
{ {
return BaseReference::iquery(pInterface, interface_type::static_type()); 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( inline XInterface * BaseReference::iquery_throw(
XInterface * pInterface, const Type & rType ) XInterface * pInterface, const Type & rType )
......
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