mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Work around a Clang trunk (towards 3.6) -Werror,-Wunused-value"

Browse Source 
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.
This commit is contained in:
Stephan Bergmann 2014-12-18 11:00:26 +01:00
parent 58bec49af3
commit 47cd375d88
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/source/debug/debug.cxx
View File

@ -324,20 +324,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const c
} }
if ( exception.Context.is() ) 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(); 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 += "\ncontext: ";
sMessage += pContext; sMessage += pContext;
} }