diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 12:48:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 12:48:44 +0200 |
| commit | 2fc4a8c8113b1bf78258845ed06662a07996a6af (patch) | |
| tree | db055018db2d6190438b451444f337215a76917f /include | |
| parent | 7ea8046c741c8b7b608f26e312cc5f1056752c09 (diff) | |
Add support for cppu::UnoType<void>
Change-Id: I88259ffaffc73979c240721d2db166c79d3085f1
Diffstat (limited to 'include')
| -rw-r--r-- | include/com/sun/star/uno/Type.hxx | 4 | ||||
| -rw-r--r-- | include/cppu/unotype.hxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx index 5eab3fecda07..6b22224c4e4a 100644 --- a/include/com/sun/star/uno/Type.hxx +++ b/include/com/sun/star/uno/Type.hxx @@ -100,11 +100,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARA inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() { - return ::cppu::UnoType< ::cppu::UnoVoidType >::get(); + return ::cppu::UnoType<void>::get(); } inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() { - return ::cppu::UnoType< ::cppu::UnoVoidType >::get(); + return ::cppu::UnoType<void>::get(); } inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx index 4c7e5a758b79..4d6194f00212 100644 --- a/include/cppu/unotype.hxx +++ b/include/cppu/unotype.hxx @@ -257,7 +257,7 @@ namespace cppu { C++ types that are unambiguously derived from one C++ type that represents a UNO type.) In addition to those C++ types that are mappings of UNO types (except for sal_uInt16 and sal_Unicode, see below), the following C++ types - are appropriate as template arguments: cppu::UnoVoidType, bool, + are appropriate as template arguments: void, cppu::UnoVoidType, bool, cppu::UnoUnsignedShortType, cppu::UnoCharType, cppu::UnoSequenceType with any appropriate template argument (the latter three to unambiguously specify UNO types, as the UNO types UNSIGNED SHORT and CHAR map to the same C++ type), @@ -284,6 +284,10 @@ private: void operator =(UnoType &) SAL_DELETED_FUNCTION; }; +template<> css::uno::Type inline const & UnoType<void>::get() { + return cppu::UnoType<cppu::UnoVoidType>::get(); +} + /** A working replacement for getCppuType (see there). |