From 47cd375d88a980f01d9ee04debf896be61d0875a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 18 Dec 2014 11:00:26 +0100
Subject: [PATCH] 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.
---
 tools/source/debug/debug.cxx | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 093622ec51f7..9e65c44fa9e6 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;
         }