From c6e2fcb2867fc0ecc6f5823d1aaae84ad023d0de Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 18 Dec 2013 10:17:02 +0100 Subject: Consistently mark these as deleted on all platforms Change-Id: I87b226fe8ade512fa5559be9cb66cff75543e383 --- include/com/sun/star/uno/Any.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'include') 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() const; - template <> - bool has() 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() const SAL_DELETED_FUNCTION; +template<> bool Any::has() const SAL_DELETED_FUNCTION; +/// @endcond + /** Template function to generically construct an any from a C++ value. @tparam C value type -- cgit