FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefix GCC version constant.

Browse Source 
From: Markus Wanner <markus@bluegap.ch>
This commit is contained in:
James Turner
2013-09-14 17:29:59 +01:00
parent 021cf1a2b4
commit bcfadd6657
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/compiler.h
View File

@@ -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__)

2
simgear/nasal/cppbind/Ghost.hxx
View File

@@ -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<BaseGhost>