[Libreoffice-commits] core.git: tools/source

Stephan Bergmann sbergman at redhat.com
Thu Dec 18 02:02:22 PST 2014


 tools/source/debug/debug.cxx |   13 -------------
 1 file changed, 13 deletions(-)

New commits:
commit 47cd375d88a980f01d9ee04debf896be61d0875a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Dec 18 11:00:26 2014 +0100

    Revert "Work around a Clang trunk (towards 3.6) -Werror,-Wunused-value"
    
    This reverts commit 146bd125a01742b2a6561a4a23735f37867d8221,
    Clang's r224465 does not look really useful the way it is, so work around
    that directly in Clang for now.

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 093622e..9e65c44 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -324,20 +324,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const c
         }
         if ( exception.Context.is() )
         {
-#if defined __clang__
-#if __has_warning("-Wunused-value")
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-value"
-    // "expression with side effects will be evaluated despite being used as an
-    // operand to 'typeid'"
-#endif
-#endif
             const char* pContext = typeid( *exception.Context.get() ).name();
-#if defined __clang__
-#if __has_warning("-Wunused-value")
-#pragma GCC diagnostic pop
-#endif
-#endif
             sMessage += "\ncontext: ";
             sMessage += pContext;
         }


More information about the Libreoffice-commits mailing list