diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-27 09:43:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-28 08:44:52 +0100 |
| commit | 0475ab72081016c8a651b9fc6cdbccc31c718cb6 (patch) | |
| tree | ab314b377fa233b9fbacb2e910bb187e7bcc89ff /include | |
| parent | 9c49ece604ae70a166fa032397fe5c904283c8a7 (diff) | |
Adapt to true wchar_t in clang-cl
Change-Id: I14c2dc0be12151b5d4ea2ba3b65030f6f4494905
Diffstat (limited to 'include')
| -rw-r--r-- | include/cppu/unotype.hxx | 6 | ||||
| -rw-r--r-- | include/rtl/ustrbuf.hxx | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx index a59445043735..a4d75011163d 100644 --- a/include/cppu/unotype.hxx +++ b/include/cppu/unotype.hxx @@ -149,7 +149,8 @@ cppu_detail_getUnoType( ::typelib_TypeClass_UNSIGNED_SHORT); } -#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__) +#if LIBO_INTERNAL_ONLY \ + && (!defined SAL_W32 || defined __MINGW32__ || defined __clang__) // cf. sal/types.h sal_Unicode inline css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_uInt16 const *) { @@ -194,7 +195,8 @@ cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoCharType const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_CHAR); } -#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__) +#if LIBO_INTERNAL_ONLY \ + && (!defined SAL_W32 || defined __MINGW32__ || defined __clang__) // cf. sal/types.h sal_Unicode inline css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_Unicode const *) { diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index f8dda00538a0..1b1067977a38 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -638,7 +638,8 @@ public: return append( &c, 1 ); } -#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__) +#if LIBO_INTERNAL_ONLY && \ + (!defined SAL_W32 || defined __MINGW32__ || defined __clang__) // cf. sal/types.h sal_Unicode void append(sal_uInt16) = delete; #endif |