diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-18 10:17:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-18 10:17:14 +0100 |
| commit | c6e2fcb2867fc0ecc6f5823d1aaae84ad023d0de (patch) | |
| tree | 7c4af595c8a4898e3a347d4228af9347acfbff82 | |
| parent | 6cd3118b6370a0314e58692e08b68c4dcb0f922a (diff) | |
Consistently mark these as deleted on all platforms
Change-Id: I87b226fe8ade512fa5559be9cb66cff75543e383
| -rw-r--r-- | include/com/sun/star/uno/Any.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h index 72357e4eafdc..b7574bb71a76 100644 --- a/include/com/sun/star/uno/Any.h +++ b/include/com/sun/star/uno/Any.h @@ -232,19 +232,18 @@ public: inline sal_Bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW(()); private: - // not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16) - explicit Any( sal_uInt16 ); -#if defined(_MSC_VER) - // Omitting the following private declarations leads to an internal compiler - // error on MSVC (version 1310). - // not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16) - template <> - sal_uInt16 get<sal_uInt16>() const; - template <> - bool has<sal_uInt16>() const; -#endif // defined(_MSC_VER) + /// @cond INTERNAL + // Forbid use with ambiguous type (sal_Unicode, sal_uInt16): + explicit Any(sal_uInt16) SAL_DELETED_FUNCTION; + /// @endcond }; +/// @cond INTERNAL +// Forbid use with ambiguous type (sal_Unicode, sal_uInt16): +template<> sal_uInt16 Any::get<sal_uInt16>() const SAL_DELETED_FUNCTION; +template<> bool Any::has<sal_uInt16>() const SAL_DELETED_FUNCTION; +/// @endcond + /** Template function to generically construct an any from a C++ value. @tparam C value type |