From a60454a786338917854f027af9eb8ebf279cd646 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 2 Mar 1999 01:01:42 +0000 Subject: [PATCH] Tweaks for compiling with native SGI compilers. --- Bucket/bucketutils.hxx | 8 +++++--- Bucket/newbucket.hxx | 4 +++- Debug/logstream.hxx | 8 ++++++-- Math/fg_geodesy.cxx | 8 ++++++++ Math/interpolater.hxx | 7 +++---- Math/point3d.hxx | 5 +++++ Misc/fgstream.hxx | 8 +++++--- Misc/strutils.hxx | 7 +++---- Serial/serial.hxx | 8 +++----- 9 files changed, 41 insertions(+), 22 deletions(-) diff --git a/Bucket/bucketutils.hxx b/Bucket/bucketutils.hxx index 852b8af7..b363a98e 100644 --- a/Bucket/bucketutils.hxx +++ b/Bucket/bucketutils.hxx @@ -27,13 +27,12 @@ #ifndef _BUCKETUTILS_HXX #define _BUCKETUTILS_HXX -#include +#include -FG_USING_NAMESPACE(std); +#include STL_STRING #include "bucketutils.h" -#include FG_USING_STD(string); inline bool @@ -71,6 +70,9 @@ operator<< ( ostream& out, const fgBUCKET& b ) // $Log$ +// Revision 1.3 1999/03/02 01:01:42 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.2 1999/01/19 20:56:53 curt // MacOS portability changes contributed by "Robert Puyol" // diff --git a/Bucket/newbucket.hxx b/Bucket/newbucket.hxx index 9d74815e..b6cd7018 100644 --- a/Bucket/newbucket.hxx +++ b/Bucket/newbucket.hxx @@ -32,7 +32,6 @@ #include STL_STRING FG_USING_STD(string); -FG_USING_NAMESPACE(std); #include // sprintf() @@ -290,6 +289,9 @@ fgBucketGenIndex( const fgBUCKET& p ) // $Log$ +// Revision 1.4 1999/03/02 01:01:43 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.3 1999/02/26 22:07:55 curt // Added initial support for native SGI compilers. // diff --git a/Debug/logstream.hxx b/Debug/logstream.hxx index 5f93b519..f79f1b88 100644 --- a/Debug/logstream.hxx +++ b/Debug/logstream.hxx @@ -29,12 +29,11 @@ #endif -#include "Include/compiler.h" +#include #ifdef FG_HAVE_STD_INCLUDES # include # include -//# include #else # include # include "Include/fg_traits.hxx" @@ -42,10 +41,12 @@ #include "debug_types.h" +#ifndef FG_HAVE_NATIVE_SGI_COMPILERS FG_USING_STD(streambuf); FG_USING_STD(ostream); FG_USING_STD(cerr); FG_USING_STD(endl); +#endif // // TODO: @@ -211,6 +212,9 @@ fglog() #endif // _LOGSTREAM_H // $Log$ +// Revision 1.4 1999/03/02 01:01:47 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.3 1999/01/19 20:53:35 curt // Portability updates by Bernie Bright. // diff --git a/Math/fg_geodesy.cxx b/Math/fg_geodesy.cxx index d53689e4..af10c101 100644 --- a/Math/fg_geodesy.cxx +++ b/Math/fg_geodesy.cxx @@ -21,7 +21,9 @@ #include #include +#ifndef FG_HAVE_NATIVE_SGI_COMPILERS FG_USING_STD(cout); +#endif // ONE_SECOND is pi/180/60/60, or about 100 feet at earths' equator #define ONE_SECOND 4.848136811E-6 @@ -162,6 +164,9 @@ void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius, $Header$ $Log$ +Revision 1.6 1999/03/02 01:01:49 curt +Tweaks for compiling with native SGI compilers. + Revision 1.5 1999/01/27 04:46:14 curt Portability tweaks by Bernie Bright. @@ -251,6 +256,9 @@ Initial Flight Gear revision. // $Log$ +// Revision 1.6 1999/03/02 01:01:49 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.5 1999/01/27 04:46:14 curt // Portability tweaks by Bernie Bright. // diff --git a/Math/interpolater.hxx b/Math/interpolater.hxx index 2ecdfa6e..4260ba48 100644 --- a/Math/interpolater.hxx +++ b/Math/interpolater.hxx @@ -37,10 +37,6 @@ #include STL_STRING FG_USING_STD(string); -#ifdef FG_HAVE_NATIVE_SGI_COMPILERS -FG_USING_NAMESPACE(std); -#endif - #define MAX_TABLE_SIZE 32 @@ -66,6 +62,9 @@ public: // $Log$ +// Revision 1.6 1999/03/02 01:01:50 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.5 1999/02/26 22:08:05 curt // Added initial support for native SGI compilers. // diff --git a/Math/point3d.hxx b/Math/point3d.hxx index ec0e51df..97527077 100644 --- a/Math/point3d.hxx +++ b/Math/point3d.hxx @@ -46,8 +46,10 @@ # include #endif +#ifndef FG_HAVE_NATIVE_SGI_COMPILERS FG_USING_STD(ostream); FG_USING_STD(istream); +#endif // -rp- assert.h is buggy under MWCWP3, as multiple #include undef assert ! #ifdef __MWERKS__ @@ -335,6 +337,9 @@ Point3D::distance3Dsquared(const Point3D& a ) const // $Log$ +// Revision 1.10 1999/03/02 01:01:52 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.9 1999/02/01 21:08:28 curt // Optimizations from Norman Vine. // diff --git a/Misc/fgstream.hxx b/Misc/fgstream.hxx index 5b3236c0..85c2be9d 100644 --- a/Misc/fgstream.hxx +++ b/Misc/fgstream.hxx @@ -47,10 +47,9 @@ #include "zfstream.hxx" FG_USING_STD(string); -FG_USING_STD(istream); -#ifdef FG_HAVE_NATIVE_SGI_COMPILERS -FG_USING_NAMESPACE(std); +#ifndef FG_HAVE_NATIVE_SGI_COMPILERS +FG_USING_STD(istream); #endif @@ -99,6 +98,9 @@ istream& skipcomment( istream& in ); #endif /* _FGSTREAM_HXX */ // $Log$ +// Revision 1.8 1999/03/02 01:01:55 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.7 1999/02/26 22:08:08 curt // Added initial support for native SGI compilers. // diff --git a/Misc/strutils.hxx b/Misc/strutils.hxx index 6386f2ac..b2c47a77 100644 --- a/Misc/strutils.hxx +++ b/Misc/strutils.hxx @@ -35,10 +35,6 @@ FG_USING_STD(string); -#ifdef FG_HAVE_NATIVE_SGI_COMPILERS -FG_USING_NAMESPACE(std); -#endif - // Default characters to remove. extern const string whitespace; @@ -68,6 +64,9 @@ atoi( const string& str ) #endif // STRUTILS_H // $Log$ +// Revision 1.6 1999/03/02 01:01:56 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.5 1999/02/26 22:08:09 curt // Added initial support for native SGI compilers. // diff --git a/Serial/serial.hxx b/Serial/serial.hxx index 470e6ed5..3b2c60b6 100644 --- a/Serial/serial.hxx +++ b/Serial/serial.hxx @@ -42,11 +42,6 @@ #include STL_STRING FG_USING_STD(string); -#ifdef FG_HAVE_NATIVE_SGI_COMPILERS -FG_USING_NAMESPACE(std); -#endif - - // if someone know how to do this all with C++ streams let me know // #include @@ -85,6 +80,9 @@ public: // $Log$ +// Revision 1.5 1999/03/02 01:01:58 curt +// Tweaks for compiling with native SGI compilers. +// // Revision 1.4 1999/02/26 22:08:13 curt // Added initial support for native SGI compilers. //