From bcfadd6657a04b199e8e8db04803488cf2afa806 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 14 Sep 2013 17:29:59 +0100 Subject: [PATCH] Prefix GCC version constant. From: Markus Wanner --- simgear/compiler.h | 2 +- simgear/nasal/cppbind/Ghost.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simgear/compiler.h b/simgear/compiler.h index 5a1cd477..2686ea1f 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -46,7 +46,7 @@ # warning GCC compilers prior to 3.4 are suspect # endif -# define GCC_VERSION (__GNUC__ * 10000 \ +# define SG_GCC_VERSION (__GNUC__ * 10000 \ + __GNUC_MINOR__ * 100 \ + __GNUC_PATCHLEVEL__) # define SG_COMPILER_STR "GNU C++ version " SG_STRINGIZE(__GNUC__) "." SG_STRINGIZE(__GNUC_MINOR__) diff --git a/simgear/nasal/cppbind/Ghost.hxx b/simgear/nasal/cppbind/Ghost.hxx index c403a307..2732c3a1 100644 --- a/simgear/nasal/cppbind/Ghost.hxx +++ b/simgear/nasal/cppbind/Ghost.hxx @@ -325,7 +325,7 @@ namespace nasal // Both ways of retrieving the address of a static member function // should be legal but not all compilers know this. // g++-4.4.7+ has been tested to work with both versions -#if defined(GCC_VERSION) && GCC_VERSION < 40407 +#if defined(SG_GCC_VERSION) && SG_GCC_VERSION < 40407 // The old version of g++ used on Jenkins (16.11.2012) only compiles // this version. &getTypeFor -- 2.39.5