From 5326020f85b67faab34bca5c605b6070c6c4bef0 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 4 Sep 2013 14:39:05 +0300 Subject: WaE: Unreachable code: Use SAL_WNOUNREACHABLE_CODE_PUSH/POP Cleaner than my first attempt. This reverts commit aa4868de78b3a3893722f7a079f4d05e18abd8db. Change-Id: I9c92be72e69292731983a53fc2de29ba333071c9 --- connectivity/source/sdbcx/VUser.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'connectivity/source/sdbcx') diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index ad088aa7545b..f7f8176e34cc 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -121,16 +121,15 @@ Reference< XNameAccess > SAL_CALL OUser::getGroups( ) throw(RuntimeException) return const_cast(this)->m_pGroups; } // ------------------------------------------------------------------------- -// ------------------------------------------------------------------------- + +SAL_WNOUNREACHABLE_CODE_PUSH sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedException( "XAuthorizable::changePassword", *this ); -#if !(defined(_MSC_VER) && defined(ENABLE_LTO)) return 0; -#endif } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) @@ -138,10 +137,11 @@ sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, s ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedException( "XAuthorizable::getGrantablePrivileges", *this ); -#if !(defined(_MSC_VER) && defined(ENABLE_LTO)) return 0; -#endif } + +SAL_WNOUNREACHABLE_CODE_POP + // ------------------------------------------------------------------------- void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { -- cgit