Tweaks for compiling with native SGI compilers.

This commit is contained in:
curt 1999-03-02 01:01:42 +00:00
parent d136ad3e57
commit a60454a786
9 changed files with 41 additions and 22 deletions

View File

@ -27,13 +27,12 @@
#ifndef _BUCKETUTILS_HXX
#define _BUCKETUTILS_HXX
#include <string>
#include <Include/compiler.h>
FG_USING_NAMESPACE(std);
#include STL_STRING
#include "bucketutils.h"
#include <Include/compiler.h>
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" <puyol@abvent.fr>
//

View File

@ -32,7 +32,6 @@
#include STL_STRING
FG_USING_STD(string);
FG_USING_NAMESPACE(std);
#include <stdio.h> // 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.
//

View File

@ -29,12 +29,11 @@
#endif
#include "Include/compiler.h"
#include <Include/compiler.h>
#ifdef FG_HAVE_STD_INCLUDES
# include <streambuf>
# include <iostream>
//# include <ostream>
#else
# include <iostream.h>
# 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.
//

View File

@ -21,7 +21,9 @@
#include <Math/fg_geodesy.hxx>
#include <Math/point3d.hxx>
#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.
//

View File

@ -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.
//

View File

@ -46,8 +46,10 @@
# include <math.h>
#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.
//

View File

@ -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.
//

View File

@ -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.
//

View File

@ -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 <stdio.h>
@ -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.
//