Home Explore Help
Sign In
cpp
/
panda3d
mirror of https://github.com/panda3d/panda3d
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch 'master' of https://github.com/JonasT/panda3d

Jonas Thiem 11 years ago
parent
76ca80dcd5 01cd4fcbd5
commit
fecb7f69fe
1 changed files with 3 additions and 0 deletions
Unified View Show Diff Stats
  1. 3 0
      dtool/src/dtoolbase/dtoolbase_cc.h

+ 3 - 0
dtool/src/dtoolbase/dtoolbase_cc.h
View File 

@@ -145,6 +145,9 @@ typedef ios::seekdir ios_seekdir;
 
 #  if __has_extension(cxx_override_control) && (__cplusplus >= 201103L)
 
 #  if __has_extension(cxx_override_control) && (__cplusplus >= 201103L)
 
 #    define FINAL final
 
 #    define FINAL final
 
 #    define OVERRIDE override
 
 #    define OVERRIDE override
 
+#  else
 
+#    define FINAL
 
+#    define OVERRIDE
 
 #  endif
 
 #  endif
 
 #elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && (__cplusplus >= 201103L)
 
 #elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && (__cplusplus >= 201103L)
 
 // noexcept was introduced in GCC 4.6, constexpr in GCC 4.7, rvalue refs in
 
 // noexcept was introduced in GCC 4.6, constexpr in GCC 4.7, rvalue refs in