From: curt Date: Wed, 24 Oct 2001 19:59:05 +0000 (+0000) Subject: Misc Irix tweaks. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f2a323e048c70fb5a00b031ca6eaadf99be04a77;p=simgear.git Misc Irix tweaks. --- diff --git a/simgear/compiler.h b/simgear/compiler.h index bb7e8303..86c7ee8c 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -283,10 +283,14 @@ # define STL_STRING # define STL_STRSTREAM -# define __STL_FUNCTION_TMPL_PARTIAL_ORDER +// # define __STL_FUNCTION_TMPL_PARTIAL_ORDER -#pragma set woff 1001,1012,1014,1116,1172,1174,1401,146,0 -#pragma set woff 1551,1552,1681 +#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 +#endif #endif // Native SGI compilers diff --git a/simgear/misc/exception.cxx b/simgear/misc/exception.cxx index f67bc352..75f4cf50 100644 --- a/simgear/misc/exception.cxx +++ b/simgear/misc/exception.cxx @@ -86,7 +86,7 @@ sg_location::asString () const { char buf[128]; string out = ""; - if (_path != "") { + if (_path != (string)"") { out += _path; if (_line != -1 || _column != -1) out += ",\n"; diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx index 181e646b..c1aed185 100644 --- a/simgear/xml/easyxml.cxx +++ b/simgear/xml/easyxml.cxx @@ -9,7 +9,9 @@ #include STL_FSTREAM +#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS) SG_USING_STD(ifstream); +#endif