[Libreoffice-commits] core.git: compilerplugins/clang

Stephan Bergmann sbergman at redhat.com
Fri Nov 25 10:24:54 UTC 2016


 compilerplugins/clang/test/datamembershadow.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f1eb0bf75296ee9c59241507a1e03f4de770afa1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 25 11:24:12 2016 +0100

    Clean up CLANG_VERSION check
    
    Change-Id: Idfdffd73e9029216775d2a6ad46293ee1a4f1308

diff --git a/compilerplugins/clang/test/datamembershadow.cxx b/compilerplugins/clang/test/datamembershadow.cxx
index 24a0da9..5965421 100644
--- a/compilerplugins/clang/test/datamembershadow.cxx
+++ b/compilerplugins/clang/test/datamembershadow.cxx
@@ -7,9 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+
+#include <config_clang.h>
 
 // '#if CLANG_VERSION >= 30800' covers large parts of compilerplugins/clang/datamembershadow.cxx
-#if (__clang_major__ == 3 && __clang_minor__ >= 8) || __clang_major__ > 3
+#if CLANG_VERSION >= 30800
 struct Bar {
     int x; // expected-note {{superclass member here [loplugin:datamembershadow]}}
 };


More information about the Libreoffice-commits mailing list