X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fcompiler.h;h=40bb0855ef6244ac99fc61c86acb136fa5b4e80e;hb=81188705b1c7341c4cce423b4694f88040080daa;hp=86c7ee8cde6fcd54046eef5507a5401e834bf4aa;hpb=f2a323e048c70fb5a00b031ca6eaadf99be04a77;p=simgear.git diff --git a/simgear/compiler.h b/simgear/compiler.h index 86c7ee8c..40bb0855 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -11,10 +11,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ * @@ -71,6 +70,14 @@ #ifndef _SG_COMPILER_H #define _SG_COMPILER_H +/* + * Helper macro SG_STRINGIZE: + * Converts the parameter X to a string after macro replacement + * on X has been performed. + */ +#define SG_STRINGIZE(X) SG_DO_STRINGIZE(X) +#define SG_DO_STRINGIZE(X) #X + #ifdef __GNUC__ # if __GNUC__ == 2 # if __GNUC_MINOR__ < 8 @@ -113,7 +120,7 @@ # define STL_STRSTREAM # endif -# elif __GNUC__ == 3 +# elif __GNUC__ >= 3 // g++-3.0.x # define SG_EXPLICIT_FUNCTION_TMPL_ARGS # define SG_NEED_AUTO_PTR @@ -133,16 +140,13 @@ # define STL_STDEXCEPT # define STL_STRING # define STL_STRSTREAM - # else # error Time to upgrade. GNU compilers < 2.7 not supported # endif -#endif -#if defined( __MINGW32__ ) -# define bcopy(from, to, n) memcpy(to, from, n) -# define FG_MEM_COPY(to,from,n) memcpy(to, from, n) -#endif +# define SG_COMPILER_STR "GNU C++ version " SG_STRINGIZE(__GNUC__) "." SG_STRINGIZE(__GNUC_MINOR__) + +#endif // __GNUC__ /* KAI C++ */ #if defined(__KCC) @@ -162,7 +166,10 @@ # define STL_STDEXCEPT # define STL_STRING # define STL_STRSTREAM -#endif + +# define SG_COMPILER_STR "Kai C++ version " SG_STRINGIZE(__KCC_VERSION) + +#endif // __KCC // // Metrowerks @@ -193,7 +200,10 @@ // -dw- currently used glut has no game mode stuff # define GLUT_WRONG_VERSION -#endif + +# define SG_COMPILER_STR "Metrowerks CodeWarrior C++ version " SG_STRINGIZE(__MWERKS__) + +#endif // __MWERKS__ // // Microsoft compilers. @@ -202,7 +212,7 @@ # define bcopy(from, to, n) memcpy(to, from, n) # define FG_MEM_COPY(to,from,n) memcpy(to, from, n) -# if _MSC_VER == 1200 // msvc++ 6.0 +# if _MSC_VER >= 1200 // msvc++ 6.0 or greater # define SG_NAMESPACES # define SG_HAVE_STD # define SG_HAVE_STD_INCLUDES @@ -218,13 +228,20 @@ # define STL_STRING # define STL_STRSTREAM +# define isnan _isnan +# define snprintf _snprintf + # pragma warning(disable: 4786) // identifier was truncated to '255' characters # pragma warning(disable: 4244) // conversion from double to float # pragma warning(disable: 4305) // + # else # error What version of MSVC++ is this? # endif -#endif + +# define SG_COMPILER_STR "Microsoft Visual C++ version " SG_STRINGIZE(_MSC_VER) + +#endif // _MSC_VER #ifdef __BORLANDC__ # if defined(HAVE_SGI_STL_PORT) @@ -256,6 +273,8 @@ # define SG_NAMESPACES // # define SG_HAVE_STD +# define SG_COMPILER_STR "Borland C++ version " SG_STRINGIZE(__BORLANDC__) + #endif // __BORLANDC__ // @@ -266,36 +285,45 @@ # define SG_HAVE_NATIVE_SGI_COMPILERS # define SG_EXPLICIT_FUNCTION_TMPL_ARGS +# define SG_CLASS_PARTIAL_SPECIALIZATION # define SG_NEED_AUTO_PTR # define SG_MEMBER_TEMPLATES # define SG_NAMESPACES # define SG_HAVE_STD -# define SG_CLASS_PARTIAL_SPECIALIZATION +# define SG_HAVE_STREAMBUF # define SG_HAVE_TRAITS +# define SG_HAVE_STD_INCLUDES # define STL_ALGORITHM # define STL_FUNCTIONAL -# define STL_IOMANIP -# define STL_IOSTREAM -# define STL_ITERATOR -# define STL_FSTREAM +# define STL_IOMANIP +# define STL_IOSTREAM +# define STL_ITERATOR +# define STL_FSTREAM # define STL_STDEXCEPT +#if (_COMPILER_VERSION < 740) +# define STL_STRING +#else # define STL_STRING -# define STL_STRSTREAM - -// # define __STL_FUNCTION_TMPL_PARTIAL_ORDER +#endif +# define STL_STRSTREAM #pragma set woff 1001,1012,1014,1116,1155,1172,1174 #pragma set woff 1401,1460,1551,1552,1681 #ifdef __cplusplus #pragma set woff 1682,3303 +#if (_COMPILER_VERSION >= 740) +# pragma set woff 3624 +#endif #endif +# define SG_COMPILER_STR "SGI MipsPro compiler version " SG_STRINGIZE(_COMPILER_VERSION) + #endif // Native SGI compilers -#if defined ( sun ) +#if defined (__sun) # include # include # if defined ( __cplusplus ) @@ -306,8 +334,58 @@ # else extern void *memmove(void *, const void *, size_t); # endif // __cplusplus + +# if !defined( __GNUC__ ) +# define SG_COMPILER_STR "Sun compiler version " SG_STRINGIZE(__SUNPRO_CC) +# endif + #endif // sun +// +// Intel C++ Compiler +// +#if defined(__ICC) || defined (__ECC) +# define SG_NAMESPACES +# define SG_HAVE_STD +# define SG_HAVE_STREAMBUF +# define SG_HAVE_TRAITS +# define SG_HAVE_STD_INCLUDES + +# define STL_ALGORITHM +# define STL_FUNCTIONAL +# define STL_IOMANIP +# define STL_IOSTREAM +# define STL_ITERATOR +# define STL_FSTREAM +# define STL_STDEXCEPT +# define STL_STRING +# define STL_STRSTREAM + +# define SG_COMPILER_STR "Intel C++ version " SG_STRINGIZE(__ICC) + +#endif // __ICC + +// +// Platform dependent gl.h and glut.h definitions +// + +#ifdef __APPLE__ +# define SG_GL_H +# define SG_GLX_H +# define SG_GLU_H +# define SG_GLEXT_H +# define SG_GLUT_H + +inline int (isnan)(double r) { return !(r <= 0 || r >= 0); } +#else +# define SG_GL_H +# define SG_GLX_H +# define SG_GLU_H +# define SG_GLEXT_H +# define SG_GLUT_H +#endif + + // // No user modifiable definitions beyond here. // @@ -389,3 +467,4 @@ inline const_mem_fun_ref_t<_Ret,_Tp> mem_fun_ref(_Ret (_Tp::*__f)() const) #endif // SG_INCOMPLETE_FUNCTIONAL #endif // _SG_COMPILER_H +