From d136ad3e5784747f907ed9528651405afb95ce95 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 26 Feb 1999 22:07:53 +0000 Subject: [PATCH] Added initial support for native SGI compilers. --- Bucket/bucketutils.cxx | 11 +++++++---- Bucket/newbucket.cxx | 8 ++++++-- Bucket/newbucket.hxx | 5 ++++- Math/interpolater.cxx | 7 ++++++- Math/interpolater.hxx | 12 +++++++++--- Misc/fgstream.hxx | 18 ++++++++++++++---- Misc/strutils.hxx | 11 +++++++++-- Misc/zfstream.hxx | 5 +++++ Serial/serial.hxx | 16 ++++++++++++---- 9 files changed, 72 insertions(+), 21 deletions(-) diff --git a/Bucket/bucketutils.cxx b/Bucket/bucketutils.cxx index 9f0ed965..0ca59713 100644 --- a/Bucket/bucketutils.cxx +++ b/Bucket/bucketutils.cxx @@ -72,11 +72,11 @@ void fgBucketParseIndex(long int index, fgBUCKET *p) { // Build a path name from an tile index void fgBucketGenBasePath( const fgBUCKET *p, char *path) { - long int index; + // long int index; int top_lon, top_lat, main_lon, main_lat; char hem, pole; - index = fgBucketGenIndex(p); + // index = fgBucketGenIndex(p); path[0] = '\0'; @@ -206,7 +206,7 @@ void fgBucketFind(double lon, double lat, fgBUCKET *p) { // Given a lat/lon, fill in the local tile index array void fgBucketGenIdxArray(fgBUCKET *p1, fgBUCKET *tiles, int width, int height) { - fgBUCKET *p2; + // fgBUCKET *p2; int dw, dh, i, j; dh = height / 2; @@ -214,7 +214,7 @@ void fgBucketGenIdxArray(fgBUCKET *p1, fgBUCKET *tiles, int width, int height) { for ( j = 0; j < height; j++ ) { for ( i = 0; i < width; i++ ) { fgBucketOffset(p1, &tiles[(j*width)+i], i - dw, j - dh); - p2 = &tiles[(j*width)+i]; + // p2 = &tiles[(j*width)+i]; /* printf( " bucket = %d %d %d %d index = %ld\n", p2->lon, p2->lat, p2->x, p2->y, fgBucketGenIndex(&tiles[(j*width)+i])); */ @@ -265,6 +265,9 @@ int main() { // $Log$ +// Revision 1.2 1999/02/26 22:07:53 curt +// Added initial support for native SGI compilers. +// // Revision 1.1 1999/02/17 20:52:05 curt // Renamed bucketutils.c -> bucketutils.cxx // diff --git a/Bucket/newbucket.cxx b/Bucket/newbucket.cxx index f57c7f72..96adf4b2 100644 --- a/Bucket/newbucket.cxx +++ b/Bucket/newbucket.cxx @@ -34,12 +34,12 @@ // Build the path name for this bucket string FGBucket::gen_base_path() { - long int index; + // long int index; int top_lon, top_lat, main_lon, main_lat; char hem, pole; char path[256]; - index = gen_index(); + // index = gen_index(); path[0] = '\0'; @@ -146,6 +146,9 @@ void fgBucketDiff( const FGBucket& b1, const FGBucket& b2, int *dx, int *dy ) { // $Log$ +// Revision 1.3 1999/02/26 22:07:54 curt +// Added initial support for native SGI compilers. +// // Revision 1.2 1999/02/11 01:09:33 curt // Added a routine to calculate the offset in bucket units between two buckets. // @@ -154,3 +157,4 @@ void fgBucketDiff( const FGBucket& b1, const FGBucket& b2, int *dx, int *dy ) { // fgBUCKET struct and C routines. This FGBucket class adjusts the tile // width towards the poles to ensure the tiles are at least 8 miles wide. // + diff --git a/Bucket/newbucket.hxx b/Bucket/newbucket.hxx index ac24b999..9d74815e 100644 --- a/Bucket/newbucket.hxx +++ b/Bucket/newbucket.hxx @@ -29,7 +29,7 @@ #include -#include +#include STL_STRING FG_USING_STD(string); FG_USING_NAMESPACE(std); @@ -290,6 +290,9 @@ fgBucketGenIndex( const fgBUCKET& p ) // $Log$ +// Revision 1.3 1999/02/26 22:07:55 curt +// Added initial support for native SGI compilers. +// // Revision 1.2 1999/02/11 01:09:34 curt // Added a routine to calculate the offset in bucket units between two buckets. // diff --git a/Math/interpolater.cxx b/Math/interpolater.cxx index 6729bcbb..9aabeda2 100644 --- a/Math/interpolater.cxx +++ b/Math/interpolater.cxx @@ -24,7 +24,9 @@ // (Log is kept at end of this file) -#include +#include + +#include STL_STRING #include #include @@ -101,6 +103,9 @@ fgINTERPTABLE::~fgINTERPTABLE( void ) { // $Log$ +// Revision 1.7 1999/02/26 22:08:03 curt +// Added initial support for native SGI compilers. +// // Revision 1.6 1999/01/27 04:46:16 curt // Portability tweaks by Bernie Bright. // diff --git a/Math/interpolater.hxx b/Math/interpolater.hxx index 9614faed..2ecdfa6e 100644 --- a/Math/interpolater.hxx +++ b/Math/interpolater.hxx @@ -32,12 +32,15 @@ # error This library requires C++ #endif - -#include - #include "Include/compiler.h" + +#include STL_STRING FG_USING_STD(string); +#ifdef FG_HAVE_NATIVE_SGI_COMPILERS +FG_USING_NAMESPACE(std); +#endif + #define MAX_TABLE_SIZE 32 @@ -63,6 +66,9 @@ public: // $Log$ +// Revision 1.5 1999/02/26 22:08:05 curt +// Added initial support for native SGI compilers. +// // Revision 1.4 1999/01/27 04:46:17 curt // Portability tweaks by Bernie Bright. // diff --git a/Misc/fgstream.hxx b/Misc/fgstream.hxx index a707acf9..5b3236c0 100644 --- a/Misc/fgstream.hxx +++ b/Misc/fgstream.hxx @@ -32,20 +32,27 @@ # include "Include/config.h" #endif -#include +#include -#include "Include/compiler.h" -#ifdef FG_HAVE_STD_INCLUDES +#if defined( FG_HAVE_STD_INCLUDES ) # include +#elif defined ( FG_HAVE_NATIVE_SGI_COMPILERS ) +# include #else # include #endif +#include STL_STRING + +#include "zfstream.hxx" + FG_USING_STD(string); FG_USING_STD(istream); +#ifdef FG_HAVE_NATIVE_SGI_COMPILERS +FG_USING_NAMESPACE(std); +#endif -#include "zfstream.hxx" //----------------------------------------------------------------------------- // @@ -92,6 +99,9 @@ istream& skipcomment( istream& in ); #endif /* _FGSTREAM_HXX */ // $Log$ +// Revision 1.7 1999/02/26 22:08:08 curt +// Added initial support for native SGI compilers. +// // Revision 1.6 1999/01/19 20:41:46 curt // Portability updates contributed by Bernie Bright. // diff --git a/Misc/strutils.hxx b/Misc/strutils.hxx index d2e196af..6386f2ac 100644 --- a/Misc/strutils.hxx +++ b/Misc/strutils.hxx @@ -24,8 +24,8 @@ #ifndef STRUTILS_H #define STRUTILS_H -#include -#include "Include/compiler.h" +#include +#include STL_STRING #ifdef FG_HAVE_STD_INCLUDES # include @@ -35,6 +35,10 @@ FG_USING_STD(string); +#ifdef FG_HAVE_NATIVE_SGI_COMPILERS +FG_USING_NAMESPACE(std); +#endif + // Default characters to remove. extern const string whitespace; @@ -64,6 +68,9 @@ atoi( const string& str ) #endif // STRUTILS_H // $Log$ +// Revision 1.5 1999/02/26 22:08:09 curt +// Added initial support for native SGI compilers. +// // Revision 1.4 1999/01/19 20:41:47 curt // Portability updates contributed by Bernie Bright. // diff --git a/Misc/zfstream.hxx b/Misc/zfstream.hxx index a2d82181..b76c3726 100644 --- a/Misc/zfstream.hxx +++ b/Misc/zfstream.hxx @@ -66,6 +66,8 @@ FG_USING_STD(streamoff); #if defined(__GNUC__) && __GNUC_MINOR__ < 8 # define ios_binary ios::bin +#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS ) +# define ios_binary 1 #else # define ios_binary ios::binary #endif @@ -152,6 +154,9 @@ struct gzifstream_base #endif // _zfstream_hxx // $Log$ +// Revision 1.8 1999/02/26 22:08:10 curt +// Added initial support for native SGI compilers. +// // Revision 1.7 1999/01/19 20:41:49 curt // Portability updates contributed by Bernie Bright. // diff --git a/Serial/serial.hxx b/Serial/serial.hxx index 02e17a9b..470e6ed5 100644 --- a/Serial/serial.hxx +++ b/Serial/serial.hxx @@ -34,14 +34,19 @@ # include #endif -#include "Include/compiler.h" -#include -FG_USING_STD(string); - #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ ) # include #endif +#include +#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 @@ -80,6 +85,9 @@ public: // $Log$ +// Revision 1.4 1999/02/26 22:08:13 curt +// Added initial support for native SGI compilers. +// // Revision 1.3 1999/02/02 20:13:24 curt // MSVC++ portability changes by Bernie Bright: // -- 2.39.5