From: ehofman Date: Fri, 26 Dec 2003 13:55:09 +0000 (+0000) Subject: Updates to support sgi's MIPSpro compiler version 7.4 and newer. This also fixes... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e54cfc002b39a55a0f3359bdffcfb01ef8065816;p=simgear.git Updates to support sgi's MIPSpro compiler version 7.4 and newer. This also fixes a number of C++ issues where FlightGear didn't follow the standard. --- diff --git a/configure.ac b/configure.ac index dd44d868..5446e906 100644 --- a/configure.ac +++ b/configure.ac @@ -47,8 +47,25 @@ case "${host}" in if test "x$CXX" = "xCC" -o "x$CXX" = "xccache CC"; then AR="$CXX -ar" ARFLAGS="-o" - CXXFLAGS="$CXXFLAGS -I$(top_srcdir)/simgear/compatibility" + CXXFLAGS="$CXXFLAGS -I$(top_srcdir)/simgear/compatibility/MIPSpro740" compatibility_DIR="compatibility" + MIPSpro_DIRS="MIPSpro740" + AC_MSG_CHECKING([for MIPSpro compiler version 7.4 or newer]) + AC_TRY_RUN([ + int main() { + if ( _COMPILER_VERSION < 740 ) { + return -1; + } + return 0; + } + + ], AC_MSG_RESULT(yes), + [ AC_MSG_RESULT(no) + CXXFLAGS="$CXXFLAGS -I$(top_srcdir)/simgear/compatibility/MIPSpro721" + MIPSpro_DIRS="$(MIPSpro_DIRS) MIPSpro721" + AC_MSG_WARN([Using our own subset of the STL headers]) + ], AC_MSG_RESULT(yes)) + AC_SUBST(MIPSpro_DIRS) fi ;; *) @@ -348,6 +365,8 @@ AC_CONFIG_FILES([ \ simgear/Makefile \ simgear/version.h \ simgear/compatibility/Makefile \ + simgear/compatibility/MIPSpro721/Makefile \ + simgear/compatibility/MIPSpro740/Makefile \ simgear/bucket/Makefile \ simgear/debug/Makefile \ simgear/ephemeris/Makefile \ diff --git a/simgear/compatibility/MIPSpro721/.cvsignore b/simgear/compatibility/MIPSpro721/.cvsignore new file mode 100644 index 00000000..282522db --- /dev/null +++ b/simgear/compatibility/MIPSpro721/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/simgear/compatibility/MIPSpro721/Makefile.am b/simgear/compatibility/MIPSpro721/Makefile.am new file mode 100644 index 00000000..f70a1920 --- /dev/null +++ b/simgear/compatibility/MIPSpro721/Makefile.am @@ -0,0 +1,14 @@ +includedir = @includedir@/compatibility/ + +include_HEADERS = \ + iostream \ + strstream \ + sstream \ + istream \ + fstream \ + iterator \ + iomanip \ + new \ + streambuf \ + \ + irix_string diff --git a/simgear/compatibility/MIPSpro721/fstream b/simgear/compatibility/MIPSpro721/fstream new file mode 100644 index 00000000..87bc2975 --- /dev/null +++ b/simgear/compatibility/MIPSpro721/fstream @@ -0,0 +1,19 @@ + +#ifndef __SG_FSTREAM +#define __SG_FSTREAM 1 + +# if defined(sgi) && !defined(__GNUC__) + +# include + + namespace std { + using ::fstream; + using ::ofstream; + using ::ifstream; + }; + + +# endif + +#endif // !__SG_FSTREAM + diff --git a/simgear/compatibility/MIPSpro721/iomanip b/simgear/compatibility/MIPSpro721/iomanip new file mode 100644 index 00000000..97d4ff1e --- /dev/null +++ b/simgear/compatibility/MIPSpro721/iomanip @@ -0,0 +1,16 @@ + +#ifndef __SG_IOMANIP +#define __SG_IOMANIP 1 + +# include + +namespace std { + + using ::setw; + using ::setprecision; + + inline int setfill(int f) { ::setfill(f); } +}; + +#endif // !__SG_IOMANIP + diff --git a/simgear/compatibility/MIPSpro721/iostream b/simgear/compatibility/MIPSpro721/iostream new file mode 100644 index 00000000..25aa0382 --- /dev/null +++ b/simgear/compatibility/MIPSpro721/iostream @@ -0,0 +1,52 @@ + +#ifndef __SG_IOSTREAM +#define __SG_IOSTREAM 1 + +# if defined(sgi) && !defined(__GNUC__) + +# include +# include + + class ios_base : public ios { + public: + + typedef int openmode; + typedef int seekdir; + + enum { binary = 0 }; + }; + + namespace std { + using ::cin; + using ::cout; + using ::cerr; + using ::clog; + using ::endl; + + using ::ios; + using ::ios_base; + using ::iostream; + using ::istream; + using ::ostream; + + using ::dec; + using ::oct; + using ::hex; + + enum { skipws=ios::skipws, + left=ios::left, right=ios::right, internal=ios::internal, + showbase=ios::showbase, showpoint=ios::showpoint, + uppercase=ios::uppercase, showpos=ios::showpos, + scientific=ios::scientific, fixed=ios::fixed, + unitbuf=ios::unitbuf, stdio=ios::stdio +#if _BOOL && __EDG_ABI_COMPATIBILITY_VERSION>227 /* bool support */ + ,boolalpha=ios::boolalpha +#endif /* bool support */ + }; + + }; + +# endif + +#endif // !__SG_IOSTREAM + diff --git a/simgear/compatibility/MIPSpro721/irix_string b/simgear/compatibility/MIPSpro721/irix_string new file mode 100644 index 00000000..1b49dd74 --- /dev/null +++ b/simgear/compatibility/MIPSpro721/irix_string @@ -0,0 +1,47 @@ + +#ifndef __SGI_HXX +#define __SGI_HXX 1 + +#ifdef __cplusplus + +#include + +inline bool +operator!=( const std::string& lhs, const char* rhs) +{ + return lhs.compare( rhs ) != 0; +} + +inline bool +operator!=( const char* lhs, const std::string& rhs) +{ + return rhs.compare( lhs ) != 0; +} + +inline bool +operator==( const std::string& lhs, const char* rhs) +{ + return lhs.compare( rhs ) == 0; +} + +inline bool +operator==( const char* lhs, const std::string& rhs) +{ + return rhs.compare( lhs ) == 0; +} + +inline std::string +operator+(const std::string& lhs, const char* rhs) +{ + return lhs + std::string(rhs); +} + +inline std::string +operator+(const char* lhs, const std::string& rhs) +{ + return std::string(lhs) + rhs; +} + +#endif /* __cplusplus */ + +#endif /* !__SGI_HXX */ diff --git a/simgear/compatibility/MIPSpro721/istream b/simgear/compatibility/MIPSpro721/istream new file mode 100644 index 00000000..c56afc14 --- /dev/null +++ b/simgear/compatibility/MIPSpro721/istream @@ -0,0 +1,17 @@ + +#ifndef __SG_ISTREAM +#define __SG_ISTREAM 1 + +# include + +# if defined(sgi) && !defined(__GNUC__) + +# include +# include + + using std::getline; + +# endif + +#endif // !__SG_ISTREAM + diff --git a/simgear/compatibility/MIPSpro721/iterator b/simgear/compatibility/MIPSpro721/iterator new file mode 100644 index 00000000..036513ff --- /dev/null +++ b/simgear/compatibility/MIPSpro721/iterator @@ -0,0 +1,8 @@ + +#ifndef __SG_ITERATOR +#define __SG_ITERATOR 1 + +# include + +#endif // !__SG_ITERATOR + diff --git a/simgear/compatibility/MIPSpro721/new b/simgear/compatibility/MIPSpro721/new new file mode 100644 index 00000000..12f95be8 --- /dev/null +++ b/simgear/compatibility/MIPSpro721/new @@ -0,0 +1,12 @@ + +#ifndef __SG_NEW +#define __SG_NEW 1 + +#if defined(sgi) && !defined(__GNUC__) + +# include + +#endif + +#endif // !__SG_NEW + diff --git a/simgear/compatibility/MIPSpro721/sstream b/simgear/compatibility/MIPSpro721/sstream new file mode 100644 index 00000000..a90a6498 --- /dev/null +++ b/simgear/compatibility/MIPSpro721/sstream @@ -0,0 +1,22 @@ + +#ifndef __SG_SSTREAM +#define __SG_SSTREAM 1 + +# include +# include +# include + +namespace std { + + class ostringstream : public ostrstream { + public: + std::string str() { return string(ostrstream::str()); } + }; + + + typedef istrstream istringstream; + +}; + +#endif // !__SG_SSTREAM + diff --git a/simgear/compatibility/MIPSpro721/streambuf b/simgear/compatibility/MIPSpro721/streambuf new file mode 100644 index 00000000..1329463a --- /dev/null +++ b/simgear/compatibility/MIPSpro721/streambuf @@ -0,0 +1,38 @@ + +#ifndef __SG_STREAMBUF +#define __SG_STREAMBUF 1 + +# include +# include + +// +// Until we find a good way to rename the original streambuf class +// and derive our own streambuf class from that, define this variable +// for now so the code can inherit our streambuf class instead. +// +# define SG_NEED_STREAMBUF_HACK 1 + +class __streambuf : virtual public streambuf { +public: + + typedef std::char_traits traits_type; + typedef std::char_traits::int_type int_type; + + typedef streampos pos_type; + typedef streamoff off_type; +}; + + +# if defined(sgi) && !defined(__GNUC__) + +# define pubsync sync + + namespace std { + using ::streambuf; + using ::streampos; + using ::streamoff; + }; +# endif + +#endif // !__SG_STREAMBUF + diff --git a/simgear/compatibility/MIPSpro721/strstream b/simgear/compatibility/MIPSpro721/strstream new file mode 100644 index 00000000..2c703525 --- /dev/null +++ b/simgear/compatibility/MIPSpro721/strstream @@ -0,0 +1,20 @@ + +#ifndef __SG_STRSTREAM +#define __SG_STRSTREAM 1 + +# include + +# if defined(sgi) && !defined(__GNUC__) + + namespace std { + using ::ends; + + using ::strstream; + using ::istrstream; + using ::ostrstream; + }; + +# endif + +#endif // !__SG_STRSTREAM + diff --git a/simgear/compatibility/MIPSpro740/.cvsignore b/simgear/compatibility/MIPSpro740/.cvsignore new file mode 100644 index 00000000..282522db --- /dev/null +++ b/simgear/compatibility/MIPSpro740/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/simgear/compatibility/MIPSpro740/Makefile.am b/simgear/compatibility/MIPSpro740/Makefile.am new file mode 100644 index 00000000..cb138d62 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/Makefile.am @@ -0,0 +1,22 @@ +includedir = @includedir@/compatibility + +EXTRA_DIST = README + +include_HEADERS = \ + cfloat \ + csetjmp \ + cstdio \ + cwchar \ + cassert \ + climits \ + csignal \ + cstdlib \ + cwctype \ + cctype \ + clocale \ + cstdarg \ + cstring \ + cerrno \ + cmath \ + cstddef \ + ctime diff --git a/simgear/compatibility/MIPSpro740/README b/simgear/compatibility/MIPSpro740/README new file mode 100644 index 00000000..eabc2b48 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/README @@ -0,0 +1,9 @@ + +The following header files where taken from the boost clib package +(http://www.boost.org): + +cassert climits csignal cstdlib cwctype +cctype clocale cstdarg cstring +cerrno cmath cstddef ctime +cfloat csetjmp cstdio cwchar + diff --git a/simgear/compatibility/MIPSpro740/cassert b/simgear/compatibility/MIPSpro740/cassert new file mode 100644 index 00000000..03f0a503 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cassert @@ -0,0 +1,10 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CASSERT_HEADER +#define __CASSERT_HEADER + +#include + +#endif // CASSERT_HEADER diff --git a/simgear/compatibility/MIPSpro740/cctype b/simgear/compatibility/MIPSpro740/cctype new file mode 100644 index 00000000..fdd01e9d --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cctype @@ -0,0 +1,26 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CCTYPE_HEADER +#define __CCTYPE_HEADER + +#include + +namespace std { + using ::isalnum; + using ::isdigit; + using ::isprint; + using ::isupper; + using ::tolower; + using ::isalpha; + using ::isgraph; + using ::ispunct; + using ::isxdigit; + using ::toupper; + using ::iscntrl; + using ::islower; + using ::isspace; +} + +#endif // CCTYPE_HEADER diff --git a/simgear/compatibility/MIPSpro740/cerrno b/simgear/compatibility/MIPSpro740/cerrno new file mode 100644 index 00000000..e369a2c0 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cerrno @@ -0,0 +1,10 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CERRNO_HEADER +#define __CERRNO_HEADER + +#include + +#endif // CERRNO_HEADER diff --git a/simgear/compatibility/MIPSpro740/cfloat b/simgear/compatibility/MIPSpro740/cfloat new file mode 100644 index 00000000..cab759d8 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cfloat @@ -0,0 +1,10 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CFLOAT_HEADER +#define __CFLOAT_HEADER + +#include + +#endif // CFLOAT_HEADER diff --git a/simgear/compatibility/MIPSpro740/climits b/simgear/compatibility/MIPSpro740/climits new file mode 100644 index 00000000..77331fdc --- /dev/null +++ b/simgear/compatibility/MIPSpro740/climits @@ -0,0 +1,10 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CLIMITS_HEADER +#define __CLIMITS_HEADER + +#include + +#endif // CLIMITS_HEADER diff --git a/simgear/compatibility/MIPSpro740/clocale b/simgear/compatibility/MIPSpro740/clocale new file mode 100644 index 00000000..89dd324a --- /dev/null +++ b/simgear/compatibility/MIPSpro740/clocale @@ -0,0 +1,16 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CLOCALE_HEADER +#define __CLOCALE_HEADER + +#include + +namespace std { + using ::lconv; + using ::localeconv; + using ::setlocale; +} + +#endif // CLOCALE_HEADER diff --git a/simgear/compatibility/MIPSpro740/cmath b/simgear/compatibility/MIPSpro740/cmath new file mode 100644 index 00000000..6da05f84 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cmath @@ -0,0 +1,35 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CMATH_HEADER +#define __CMATH_HEADER + +#include + +namespace std { + using ::acos; + using ::cos; + using ::fmod; + using ::modf; + using ::tan; + using ::asin; + using ::cosh; + using ::frexp; + using ::pow; + using ::tanh; + using ::atan; + using ::exp; + using ::ldexp; + using ::sin; + using ::atan2; + using ::fabs; + using ::log; + using ::sinh; + using ::ceil; + using ::floor; + using ::log10; + using ::sqrt; +} + +#endif // CMATH_HEADER diff --git a/simgear/compatibility/MIPSpro740/csetjmp b/simgear/compatibility/MIPSpro740/csetjmp new file mode 100644 index 00000000..80619c14 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/csetjmp @@ -0,0 +1,15 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CSETJMP_HEADER +#define __CSETJMP_HEADER + +#include + +namespace std { + using ::jmp_buf; + using ::longjmp; +} + +#endif // CSETJMP_HEADER diff --git a/simgear/compatibility/MIPSpro740/csignal b/simgear/compatibility/MIPSpro740/csignal new file mode 100644 index 00000000..00c588a3 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/csignal @@ -0,0 +1,16 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CSIGNAL_HEADER +#define __CSIGNAL_HEADER + +#include + +namespace std { + using ::sig_atomic_t; + using ::raise; + using ::signal; +} + +#endif // CSIGNAL_HEADER diff --git a/simgear/compatibility/MIPSpro740/cstdarg b/simgear/compatibility/MIPSpro740/cstdarg new file mode 100644 index 00000000..d9a093ec --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cstdarg @@ -0,0 +1,14 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CSTDARG_HEADER +#define __CSTDARG_HEADER + +#include + +namespace std { + using ::va_list; +} + +#endif // CSTDARG_HEADER diff --git a/simgear/compatibility/MIPSpro740/cstddef b/simgear/compatibility/MIPSpro740/cstddef new file mode 100644 index 00000000..9275b416 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cstddef @@ -0,0 +1,15 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CSTDDEF_HEADER +#define __CSTDDEF_HEADER + +#include + +namespace std { + using ::ptrdiff_t; + using ::size_t; +} + +#endif // CSTDDEF_HEADER diff --git a/simgear/compatibility/MIPSpro740/cstdio b/simgear/compatibility/MIPSpro740/cstdio new file mode 100644 index 00000000..2d92c802 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cstdio @@ -0,0 +1,57 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CSTDIO_HEADER +#define __CSTDIO_HEADER + +#include + +namespace std { + using ::FILE; + using ::fpos_t; + using ::size_t; + using ::clearerr; + using ::fgets; + using ::fscanf; + using ::gets; + using ::rename; + using ::tmpfile; + using ::fclose; + using ::fopen; + using ::fseek; + using ::perror; + using ::rewind; + using ::tmpnam; + using ::feof; + using ::fprintf; + using ::fsetpos; + using ::printf; + using ::scanf; + using ::ungetc; + using ::ferror; + using ::fputc; + using ::ftell; + using ::putc; + using ::setbuf; + using ::vfprintf; + using ::fflush; + using ::fputs; + using ::fwrite; + using ::putchar; + using ::setvbuf; + using ::vprintf; + using ::fgetc; + using ::fread; + using ::getc; + using ::puts; + using ::sprintf; + using ::vsprintf; + using ::fgetpos; + using ::freopen; + using ::getchar; + using ::remove; + using ::sscanf; +} + +#endif // CSTDIO_HEADER diff --git a/simgear/compatibility/MIPSpro740/cstdlib b/simgear/compatibility/MIPSpro740/cstdlib new file mode 100644 index 00000000..7ac5130e --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cstdlib @@ -0,0 +1,43 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CSTDLIB_HEADER +#define __CSTDLIB_HEADER + +#include + +namespace std { + using ::abort; + using ::atexit; + using ::exit; + using ::getenv; + using ::system; + using ::calloc; + using ::malloc; + using ::free; + using ::realloc; + using ::atol; + using ::mblen; + using ::strtod; + using ::wctomb; + using ::atof; + using ::mbstowcs; + using ::strtol; + using ::wcstombs; + using ::atoi; + using ::mbtowc; + using ::strtoul; + using ::bsearch; + using ::qsort; + using ::div_t; + using ::ldiv_t; + using ::abs; + using ::labs; + using ::srand; + using ::div; + using ::ldiv; + using ::rand; +} + +#endif // CSTDLIB_HEADER diff --git a/simgear/compatibility/MIPSpro740/cstring b/simgear/compatibility/MIPSpro740/cstring new file mode 100644 index 00000000..bcbf6b1f --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cstring @@ -0,0 +1,36 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CSTRING_HEADER +#define __CSTRING_HEADER + +#include + +namespace std { + using ::size_t; + using ::memchr; + using ::strcat; + using ::strcspn; + using ::strncpy; + using ::strtok; + using ::memcmp; + using ::strchr; + using ::strerror; + using ::strpbrk; + using ::strxfrm; + using ::memcpy; + using ::strcmp; + using ::strlen; + using ::strrchr; + using ::memmove; + using ::strcoll; + using ::strncat; + using ::strspn; + using ::memset; + using ::strcpy; + using ::strncmp; + using ::strstr; +} + +#endif // CSTRING_HEADER diff --git a/simgear/compatibility/MIPSpro740/ctime b/simgear/compatibility/MIPSpro740/ctime new file mode 100644 index 00000000..9114c3bb --- /dev/null +++ b/simgear/compatibility/MIPSpro740/ctime @@ -0,0 +1,26 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CTIME_HEADER +#define __CTIME_HEADER + +#include + +namespace std { + using ::size_t; + using ::clock_t; + using ::time_t; + using ::tm; + using ::asctime; + using ::clock; + using ::difftime; + using ::localtime; + using ::strftime; + using ::ctime; + using ::gmtime; + using ::mktime; + using ::time; +} + +#endif // CTIME_HEADER diff --git a/simgear/compatibility/MIPSpro740/cwchar b/simgear/compatibility/MIPSpro740/cwchar new file mode 100644 index 00000000..e38e6264 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cwchar @@ -0,0 +1,156 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CWCHAR_HEADER +#define __CWCHAR_HEADER + +#include + +namespace std { + using ::mbstate_t; + using ::wint_t; + using ::size_t; +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::btowc; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::getwchar; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::ungetwc; +#endif + using ::wcscpy; +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wcsrtombs; +#endif +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wmemchr; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::fgetwc; +#endif +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::mbrlen; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::vfwprintf; +#endif +#endif + using ::wcscspn; + using ::wcsspn; +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wmemcmp; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::fgetws; +#endif +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::mbrtowc; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::vswprintf; +#endif +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::wcsftime; +#endif + using ::wcsstr; +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wmemcpy; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::fputwc; +#endif +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::mbsinit; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::vwprintf; +#endif +#endif + using ::wcslen; + using ::wcstod; +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wmemmove; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::fputws; +#endif +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::mbsrtowcs; +#endif +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wcrtomb; +#endif + using ::wcsncat; + using ::wcstok; +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wmemset; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__DECCXX_VER) && __DECCXX_VER <= 60290024) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::fwide; +#endif +#endif +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::putwc; +#endif + using ::wcscat; + using ::wcsncmp; + using ::wcstol; +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wprintf; +#endif +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::fwprintf; +#endif +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::putwchar; +#endif + using ::wcschr; + using ::wcsncpy; + using ::wcstoul; +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wscanf; +#endif +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::fwscanf; +#endif +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::swprintf; +#endif +#endif + using ::wcscmp; + using ::wcspbrk; + using ::wcsxfrm; +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) + using ::getwc; +#endif +#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::swscanf; +#endif +#endif + using ::wcscoll; + using ::wcsrchr; +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wctob; +#endif +} + +#endif // CWCHAR_HEADER diff --git a/simgear/compatibility/MIPSpro740/cwctype b/simgear/compatibility/MIPSpro740/cwctype new file mode 100644 index 00000000..7b2f6bb2 --- /dev/null +++ b/simgear/compatibility/MIPSpro740/cwctype @@ -0,0 +1,39 @@ +// This file is automatically generated. Do not edit. +// ['../../../libs/compatibility/generate_cpp_c_headers.py'] +// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') + +#ifndef __CWCTYPE_HEADER +#define __CWCTYPE_HEADER + +#include + +namespace std { +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wctrans_t; +#endif + using ::wctype_t; + using ::wint_t; + using ::iswalnum; + using ::iswctype; + using ::iswlower; + using ::iswspace; +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::towctrans; +#endif +#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) + using ::wctrans; +#endif + using ::iswalpha; + using ::iswdigit; + using ::iswprint; + using ::iswupper; + using ::towlower; + using ::wctype; + using ::iswcntrl; + using ::iswgraph; + using ::iswpunct; + using ::iswxdigit; + using ::towupper; +} + +#endif // CWCTYPE_HEADER diff --git a/simgear/compatibility/Makefile.am b/simgear/compatibility/Makefile.am index 404ebfc7..ad644560 100644 --- a/simgear/compatibility/Makefile.am +++ b/simgear/compatibility/Makefile.am @@ -1,33 +1 @@ -includedir = @includedir@/compatibility - -EXTRA_DIST = README - -include_HEADERS = \ - cfloat \ - csetjmp \ - cstdio \ - cwchar \ - iostream \ - strstream \ - sstream \ - cassert \ - climits \ - csignal \ - cstdlib \ - cwctype \ - istream \ - cctype \ - clocale \ - cstdarg \ - cstring \ - fstream \ - iterator \ - cerrno \ - cmath \ - cstddef \ - ctime \ - iomanip \ - new \ - streambuf \ - \ - irix_string +SUBDIRS = $(MIPSpro_DIRS) diff --git a/simgear/compatibility/README b/simgear/compatibility/README deleted file mode 100644 index eabc2b48..00000000 --- a/simgear/compatibility/README +++ /dev/null @@ -1,9 +0,0 @@ - -The following header files where taken from the boost clib package -(http://www.boost.org): - -cassert climits csignal cstdlib cwctype -cctype clocale cstdarg cstring -cerrno cmath cstddef ctime -cfloat csetjmp cstdio cwchar - diff --git a/simgear/compatibility/cassert b/simgear/compatibility/cassert deleted file mode 100644 index 03f0a503..00000000 --- a/simgear/compatibility/cassert +++ /dev/null @@ -1,10 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CASSERT_HEADER -#define __CASSERT_HEADER - -#include - -#endif // CASSERT_HEADER diff --git a/simgear/compatibility/cctype b/simgear/compatibility/cctype deleted file mode 100644 index fdd01e9d..00000000 --- a/simgear/compatibility/cctype +++ /dev/null @@ -1,26 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CCTYPE_HEADER -#define __CCTYPE_HEADER - -#include - -namespace std { - using ::isalnum; - using ::isdigit; - using ::isprint; - using ::isupper; - using ::tolower; - using ::isalpha; - using ::isgraph; - using ::ispunct; - using ::isxdigit; - using ::toupper; - using ::iscntrl; - using ::islower; - using ::isspace; -} - -#endif // CCTYPE_HEADER diff --git a/simgear/compatibility/cerrno b/simgear/compatibility/cerrno deleted file mode 100644 index e369a2c0..00000000 --- a/simgear/compatibility/cerrno +++ /dev/null @@ -1,10 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CERRNO_HEADER -#define __CERRNO_HEADER - -#include - -#endif // CERRNO_HEADER diff --git a/simgear/compatibility/cfloat b/simgear/compatibility/cfloat deleted file mode 100644 index cab759d8..00000000 --- a/simgear/compatibility/cfloat +++ /dev/null @@ -1,10 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CFLOAT_HEADER -#define __CFLOAT_HEADER - -#include - -#endif // CFLOAT_HEADER diff --git a/simgear/compatibility/climits b/simgear/compatibility/climits deleted file mode 100644 index 77331fdc..00000000 --- a/simgear/compatibility/climits +++ /dev/null @@ -1,10 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CLIMITS_HEADER -#define __CLIMITS_HEADER - -#include - -#endif // CLIMITS_HEADER diff --git a/simgear/compatibility/clocale b/simgear/compatibility/clocale deleted file mode 100644 index 89dd324a..00000000 --- a/simgear/compatibility/clocale +++ /dev/null @@ -1,16 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CLOCALE_HEADER -#define __CLOCALE_HEADER - -#include - -namespace std { - using ::lconv; - using ::localeconv; - using ::setlocale; -} - -#endif // CLOCALE_HEADER diff --git a/simgear/compatibility/cmath b/simgear/compatibility/cmath deleted file mode 100644 index 6da05f84..00000000 --- a/simgear/compatibility/cmath +++ /dev/null @@ -1,35 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CMATH_HEADER -#define __CMATH_HEADER - -#include - -namespace std { - using ::acos; - using ::cos; - using ::fmod; - using ::modf; - using ::tan; - using ::asin; - using ::cosh; - using ::frexp; - using ::pow; - using ::tanh; - using ::atan; - using ::exp; - using ::ldexp; - using ::sin; - using ::atan2; - using ::fabs; - using ::log; - using ::sinh; - using ::ceil; - using ::floor; - using ::log10; - using ::sqrt; -} - -#endif // CMATH_HEADER diff --git a/simgear/compatibility/csetjmp b/simgear/compatibility/csetjmp deleted file mode 100644 index 80619c14..00000000 --- a/simgear/compatibility/csetjmp +++ /dev/null @@ -1,15 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CSETJMP_HEADER -#define __CSETJMP_HEADER - -#include - -namespace std { - using ::jmp_buf; - using ::longjmp; -} - -#endif // CSETJMP_HEADER diff --git a/simgear/compatibility/csignal b/simgear/compatibility/csignal deleted file mode 100644 index 00c588a3..00000000 --- a/simgear/compatibility/csignal +++ /dev/null @@ -1,16 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CSIGNAL_HEADER -#define __CSIGNAL_HEADER - -#include - -namespace std { - using ::sig_atomic_t; - using ::raise; - using ::signal; -} - -#endif // CSIGNAL_HEADER diff --git a/simgear/compatibility/cstdarg b/simgear/compatibility/cstdarg deleted file mode 100644 index d9a093ec..00000000 --- a/simgear/compatibility/cstdarg +++ /dev/null @@ -1,14 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CSTDARG_HEADER -#define __CSTDARG_HEADER - -#include - -namespace std { - using ::va_list; -} - -#endif // CSTDARG_HEADER diff --git a/simgear/compatibility/cstddef b/simgear/compatibility/cstddef deleted file mode 100644 index 9275b416..00000000 --- a/simgear/compatibility/cstddef +++ /dev/null @@ -1,15 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CSTDDEF_HEADER -#define __CSTDDEF_HEADER - -#include - -namespace std { - using ::ptrdiff_t; - using ::size_t; -} - -#endif // CSTDDEF_HEADER diff --git a/simgear/compatibility/cstdio b/simgear/compatibility/cstdio deleted file mode 100644 index 2d92c802..00000000 --- a/simgear/compatibility/cstdio +++ /dev/null @@ -1,57 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CSTDIO_HEADER -#define __CSTDIO_HEADER - -#include - -namespace std { - using ::FILE; - using ::fpos_t; - using ::size_t; - using ::clearerr; - using ::fgets; - using ::fscanf; - using ::gets; - using ::rename; - using ::tmpfile; - using ::fclose; - using ::fopen; - using ::fseek; - using ::perror; - using ::rewind; - using ::tmpnam; - using ::feof; - using ::fprintf; - using ::fsetpos; - using ::printf; - using ::scanf; - using ::ungetc; - using ::ferror; - using ::fputc; - using ::ftell; - using ::putc; - using ::setbuf; - using ::vfprintf; - using ::fflush; - using ::fputs; - using ::fwrite; - using ::putchar; - using ::setvbuf; - using ::vprintf; - using ::fgetc; - using ::fread; - using ::getc; - using ::puts; - using ::sprintf; - using ::vsprintf; - using ::fgetpos; - using ::freopen; - using ::getchar; - using ::remove; - using ::sscanf; -} - -#endif // CSTDIO_HEADER diff --git a/simgear/compatibility/cstdlib b/simgear/compatibility/cstdlib deleted file mode 100644 index 7ac5130e..00000000 --- a/simgear/compatibility/cstdlib +++ /dev/null @@ -1,43 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CSTDLIB_HEADER -#define __CSTDLIB_HEADER - -#include - -namespace std { - using ::abort; - using ::atexit; - using ::exit; - using ::getenv; - using ::system; - using ::calloc; - using ::malloc; - using ::free; - using ::realloc; - using ::atol; - using ::mblen; - using ::strtod; - using ::wctomb; - using ::atof; - using ::mbstowcs; - using ::strtol; - using ::wcstombs; - using ::atoi; - using ::mbtowc; - using ::strtoul; - using ::bsearch; - using ::qsort; - using ::div_t; - using ::ldiv_t; - using ::abs; - using ::labs; - using ::srand; - using ::div; - using ::ldiv; - using ::rand; -} - -#endif // CSTDLIB_HEADER diff --git a/simgear/compatibility/cstring b/simgear/compatibility/cstring deleted file mode 100644 index bcbf6b1f..00000000 --- a/simgear/compatibility/cstring +++ /dev/null @@ -1,36 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CSTRING_HEADER -#define __CSTRING_HEADER - -#include - -namespace std { - using ::size_t; - using ::memchr; - using ::strcat; - using ::strcspn; - using ::strncpy; - using ::strtok; - using ::memcmp; - using ::strchr; - using ::strerror; - using ::strpbrk; - using ::strxfrm; - using ::memcpy; - using ::strcmp; - using ::strlen; - using ::strrchr; - using ::memmove; - using ::strcoll; - using ::strncat; - using ::strspn; - using ::memset; - using ::strcpy; - using ::strncmp; - using ::strstr; -} - -#endif // CSTRING_HEADER diff --git a/simgear/compatibility/ctime b/simgear/compatibility/ctime deleted file mode 100644 index 9114c3bb..00000000 --- a/simgear/compatibility/ctime +++ /dev/null @@ -1,26 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CTIME_HEADER -#define __CTIME_HEADER - -#include - -namespace std { - using ::size_t; - using ::clock_t; - using ::time_t; - using ::tm; - using ::asctime; - using ::clock; - using ::difftime; - using ::localtime; - using ::strftime; - using ::ctime; - using ::gmtime; - using ::mktime; - using ::time; -} - -#endif // CTIME_HEADER diff --git a/simgear/compatibility/cwchar b/simgear/compatibility/cwchar deleted file mode 100644 index e38e6264..00000000 --- a/simgear/compatibility/cwchar +++ /dev/null @@ -1,156 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CWCHAR_HEADER -#define __CWCHAR_HEADER - -#include - -namespace std { - using ::mbstate_t; - using ::wint_t; - using ::size_t; -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::btowc; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::getwchar; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::ungetwc; -#endif - using ::wcscpy; -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wcsrtombs; -#endif -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wmemchr; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::fgetwc; -#endif -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::mbrlen; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::vfwprintf; -#endif -#endif - using ::wcscspn; - using ::wcsspn; -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wmemcmp; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::fgetws; -#endif -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::mbrtowc; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::vswprintf; -#endif -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::wcsftime; -#endif - using ::wcsstr; -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wmemcpy; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::fputwc; -#endif -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::mbsinit; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::vwprintf; -#endif -#endif - using ::wcslen; - using ::wcstod; -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wmemmove; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::fputws; -#endif -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::mbsrtowcs; -#endif -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wcrtomb; -#endif - using ::wcsncat; - using ::wcstok; -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wmemset; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__DECCXX_VER) && __DECCXX_VER <= 60290024) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::fwide; -#endif -#endif -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::putwc; -#endif - using ::wcscat; - using ::wcsncmp; - using ::wcstol; -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wprintf; -#endif -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::fwprintf; -#endif -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::putwchar; -#endif - using ::wcschr; - using ::wcsncpy; - using ::wcstoul; -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wscanf; -#endif -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::fwscanf; -#endif -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::swprintf; -#endif -#endif - using ::wcscmp; - using ::wcspbrk; - using ::wcsxfrm; -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) - using ::getwc; -#endif -#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005) -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::swscanf; -#endif -#endif - using ::wcscoll; - using ::wcsrchr; -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wctob; -#endif -} - -#endif // CWCHAR_HEADER diff --git a/simgear/compatibility/cwctype b/simgear/compatibility/cwctype deleted file mode 100644 index 7b2f6bb2..00000000 --- a/simgear/compatibility/cwctype +++ /dev/null @@ -1,39 +0,0 @@ -// This file is automatically generated. Do not edit. -// ['../../../libs/compatibility/generate_cpp_c_headers.py'] -// Mon Apr 16 15:16:00 2001 ('PST', 'PDT') - -#ifndef __CWCTYPE_HEADER -#define __CWCTYPE_HEADER - -#include - -namespace std { -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wctrans_t; -#endif - using ::wctype_t; - using ::wint_t; - using ::iswalnum; - using ::iswctype; - using ::iswlower; - using ::iswspace; -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::towctrans; -#endif -#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730) - using ::wctrans; -#endif - using ::iswalpha; - using ::iswdigit; - using ::iswprint; - using ::iswupper; - using ::towlower; - using ::wctype; - using ::iswcntrl; - using ::iswgraph; - using ::iswpunct; - using ::iswxdigit; - using ::towupper; -} - -#endif // CWCTYPE_HEADER diff --git a/simgear/compatibility/fstream b/simgear/compatibility/fstream deleted file mode 100644 index 87bc2975..00000000 --- a/simgear/compatibility/fstream +++ /dev/null @@ -1,19 +0,0 @@ - -#ifndef __SG_FSTREAM -#define __SG_FSTREAM 1 - -# if defined(sgi) && !defined(__GNUC__) - -# include - - namespace std { - using ::fstream; - using ::ofstream; - using ::ifstream; - }; - - -# endif - -#endif // !__SG_FSTREAM - diff --git a/simgear/compatibility/iomanip b/simgear/compatibility/iomanip deleted file mode 100644 index 97d4ff1e..00000000 --- a/simgear/compatibility/iomanip +++ /dev/null @@ -1,16 +0,0 @@ - -#ifndef __SG_IOMANIP -#define __SG_IOMANIP 1 - -# include - -namespace std { - - using ::setw; - using ::setprecision; - - inline int setfill(int f) { ::setfill(f); } -}; - -#endif // !__SG_IOMANIP - diff --git a/simgear/compatibility/iostream b/simgear/compatibility/iostream deleted file mode 100644 index 25aa0382..00000000 --- a/simgear/compatibility/iostream +++ /dev/null @@ -1,52 +0,0 @@ - -#ifndef __SG_IOSTREAM -#define __SG_IOSTREAM 1 - -# if defined(sgi) && !defined(__GNUC__) - -# include -# include - - class ios_base : public ios { - public: - - typedef int openmode; - typedef int seekdir; - - enum { binary = 0 }; - }; - - namespace std { - using ::cin; - using ::cout; - using ::cerr; - using ::clog; - using ::endl; - - using ::ios; - using ::ios_base; - using ::iostream; - using ::istream; - using ::ostream; - - using ::dec; - using ::oct; - using ::hex; - - enum { skipws=ios::skipws, - left=ios::left, right=ios::right, internal=ios::internal, - showbase=ios::showbase, showpoint=ios::showpoint, - uppercase=ios::uppercase, showpos=ios::showpos, - scientific=ios::scientific, fixed=ios::fixed, - unitbuf=ios::unitbuf, stdio=ios::stdio -#if _BOOL && __EDG_ABI_COMPATIBILITY_VERSION>227 /* bool support */ - ,boolalpha=ios::boolalpha -#endif /* bool support */ - }; - - }; - -# endif - -#endif // !__SG_IOSTREAM - diff --git a/simgear/compatibility/irix_string b/simgear/compatibility/irix_string deleted file mode 100644 index 1b49dd74..00000000 --- a/simgear/compatibility/irix_string +++ /dev/null @@ -1,47 +0,0 @@ - -#ifndef __SGI_HXX -#define __SGI_HXX 1 - -#ifdef __cplusplus - -#include - -inline bool -operator!=( const std::string& lhs, const char* rhs) -{ - return lhs.compare( rhs ) != 0; -} - -inline bool -operator!=( const char* lhs, const std::string& rhs) -{ - return rhs.compare( lhs ) != 0; -} - -inline bool -operator==( const std::string& lhs, const char* rhs) -{ - return lhs.compare( rhs ) == 0; -} - -inline bool -operator==( const char* lhs, const std::string& rhs) -{ - return rhs.compare( lhs ) == 0; -} - -inline std::string -operator+(const std::string& lhs, const char* rhs) -{ - return lhs + std::string(rhs); -} - -inline std::string -operator+(const char* lhs, const std::string& rhs) -{ - return std::string(lhs) + rhs; -} - -#endif /* __cplusplus */ - -#endif /* !__SGI_HXX */ diff --git a/simgear/compatibility/istream b/simgear/compatibility/istream deleted file mode 100644 index c56afc14..00000000 --- a/simgear/compatibility/istream +++ /dev/null @@ -1,17 +0,0 @@ - -#ifndef __SG_ISTREAM -#define __SG_ISTREAM 1 - -# include - -# if defined(sgi) && !defined(__GNUC__) - -# include -# include - - using std::getline; - -# endif - -#endif // !__SG_ISTREAM - diff --git a/simgear/compatibility/iterator b/simgear/compatibility/iterator deleted file mode 100644 index 036513ff..00000000 --- a/simgear/compatibility/iterator +++ /dev/null @@ -1,8 +0,0 @@ - -#ifndef __SG_ITERATOR -#define __SG_ITERATOR 1 - -# include - -#endif // !__SG_ITERATOR - diff --git a/simgear/compatibility/new b/simgear/compatibility/new deleted file mode 100644 index 12f95be8..00000000 --- a/simgear/compatibility/new +++ /dev/null @@ -1,12 +0,0 @@ - -#ifndef __SG_NEW -#define __SG_NEW 1 - -#if defined(sgi) && !defined(__GNUC__) - -# include - -#endif - -#endif // !__SG_NEW - diff --git a/simgear/compatibility/sstream b/simgear/compatibility/sstream deleted file mode 100644 index a90a6498..00000000 --- a/simgear/compatibility/sstream +++ /dev/null @@ -1,22 +0,0 @@ - -#ifndef __SG_SSTREAM -#define __SG_SSTREAM 1 - -# include -# include -# include - -namespace std { - - class ostringstream : public ostrstream { - public: - std::string str() { return string(ostrstream::str()); } - }; - - - typedef istrstream istringstream; - -}; - -#endif // !__SG_SSTREAM - diff --git a/simgear/compatibility/streambuf b/simgear/compatibility/streambuf deleted file mode 100644 index 1329463a..00000000 --- a/simgear/compatibility/streambuf +++ /dev/null @@ -1,38 +0,0 @@ - -#ifndef __SG_STREAMBUF -#define __SG_STREAMBUF 1 - -# include -# include - -// -// Until we find a good way to rename the original streambuf class -// and derive our own streambuf class from that, define this variable -// for now so the code can inherit our streambuf class instead. -// -# define SG_NEED_STREAMBUF_HACK 1 - -class __streambuf : virtual public streambuf { -public: - - typedef std::char_traits traits_type; - typedef std::char_traits::int_type int_type; - - typedef streampos pos_type; - typedef streamoff off_type; -}; - - -# if defined(sgi) && !defined(__GNUC__) - -# define pubsync sync - - namespace std { - using ::streambuf; - using ::streampos; - using ::streamoff; - }; -# endif - -#endif // !__SG_STREAMBUF - diff --git a/simgear/compatibility/strstream b/simgear/compatibility/strstream deleted file mode 100644 index 2c703525..00000000 --- a/simgear/compatibility/strstream +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef __SG_STRSTREAM -#define __SG_STRSTREAM 1 - -# include - -# if defined(sgi) && !defined(__GNUC__) - - namespace std { - using ::ends; - - using ::strstream; - using ::istrstream; - using ::ostrstream; - }; - -# endif - -#endif // !__SG_STRSTREAM - diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx index c6f5145b..44047422 100644 --- a/simgear/props/props.cxx +++ b/simgear/props/props.cxx @@ -71,12 +71,12 @@ public: // Default values for every type. //////////////////////////////////////////////////////////////////////// -const bool SGRawValue::DefaultValue = false; -const int SGRawValue::DefaultValue = 0; -const long SGRawValue::DefaultValue = 0L; -const float SGRawValue::DefaultValue = 0.0; -const double SGRawValue::DefaultValue = 0.0L; -const char * const SGRawValue::DefaultValue = ""; +template<> const bool SGRawValue::DefaultValue = false; +template<> const int SGRawValue::DefaultValue = 0; +template<> const long SGRawValue::DefaultValue = 0L; +template<> const float SGRawValue::DefaultValue = 0.0; +template<> const double SGRawValue::DefaultValue = 0.0L; +template<> const char * const SGRawValue::DefaultValue = ""; diff --git a/simgear/scene/sky/clouds3d/SkyBVTree.hpp b/simgear/scene/sky/clouds3d/SkyBVTree.hpp index aa03dcac..8f646ff1 100644 --- a/simgear/scene/sky/clouds3d/SkyBVTree.hpp +++ b/simgear/scene/sky/clouds3d/SkyBVTree.hpp @@ -214,9 +214,9 @@ class SkyBVTree : public SkyBaseBVTree { public: typedef SkyBaseBVTree BaseTree; - typedef BaseTree::BV BV; - typedef BaseTree::NodeObject NodeObject; - typedef BaseTree::Node Node; + typedef typename SkyBaseBVTree::BV BV; + typedef typename BaseTree::NodeObject NodeObject; + typedef typename BaseTree::Node Node; void Clear() { diff --git a/simgear/scene/sky/clouds3d/SkyBVTreeSplitter.hpp b/simgear/scene/sky/clouds3d/SkyBVTreeSplitter.hpp index 2bf1f543..35457d55 100644 --- a/simgear/scene/sky/clouds3d/SkyBVTreeSplitter.hpp +++ b/simgear/scene/sky/clouds3d/SkyBVTreeSplitter.hpp @@ -52,7 +52,7 @@ template class SkyBoundingBoxSplitter { public: - typedef SkyBaseBVTree::NodeObject NodeObjectBox; + typedef typename SkyBaseBVTree::NodeObject NodeObjectBox; //typedef SkyBaseBVTree::NodeObject NodeObjectSphere; #if _MSC_VER == 1200 @@ -183,7 +183,7 @@ class SkyAABBTreeSplitter { public: typedef SkyMinMaxBox BV; - typedef SkyBaseBVTree::NodeObject NodeObject; + typedef typename SkyBaseBVTree::NodeObject NodeObject; SkyAABBTreeSplitter(const NodeObject* pObjs, unsigned int iNumObjs) : _splitter(pObjs, iNumObjs) {}