From 0bde38fc6fab483587be3299c65f60382bb4e483 Mon Sep 17 00:00:00 2001 From: Bernd Flemisch <bernd@iws.uni-stuttgart.de> Date: Fri, 24 Aug 2012 13:18:06 +0000 Subject: [PATCH] valgrind: avoid defining static_assert as a macro if clang is used. See FS# 140. Reviewed by Christoph. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8996 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/common/valgrind.hh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dumux/common/valgrind.hh b/dumux/common/valgrind.hh index 801467caca..334754a69b 100644 --- a/dumux/common/valgrind.hh +++ b/dumux/common/valgrind.hh @@ -26,6 +26,7 @@ #ifndef DUMUX_VALGRIND_HH #define DUMUX_VALGRIND_HH +#ifndef __clang__ #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) // do not do static_asserts for gcc < 4.5 (semantics changed, so old // GCCs will complain when using static_assert) @@ -38,6 +39,7 @@ # undef HAVE_VALGRIND # endif #endif // GCC < 4.5 +#endif // __clang__ #ifndef HAVE_VALGRIND // make sure that the HAVE_VALGRIND macro is always defined -- GitLab