Added initial support for native SGI compilers.

diff --git a/Bucket/bucketutils.cxx b/Bucket/bucketutils.cxx
index 9f0ed9656e19fff68f1fe7e6b640a90f97e4dca5..0ca5971301035cd58548f38bd21d7ad7c5fafea3 100644 (file)
--- 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 f57c7f7208c216d17670820b890fe90afc502631..96adf4b2c1e1621960c0f53f66e8cc245b17e7c3 100644 (file)
--- 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 ac24b999b4ae31d61cecead62706e5181351babb..9d74815e7ab5c51b6f4bd109a8d4f5df026a00a5 100644 (file)
--- a/Bucket/newbucket.hxx
+++ b/Bucket/newbucket.hxx
@@ -29,7 +29,7 @@
 
 #include <Include/compiler.h>
 
-#include <string>
+#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 6729bcbbd18d27453fe7cfbb0b22a4d2d0ee1993..9aabeda2f433aeccf9576b542010e55524828164 100644 (file)
--- a/Math/interpolater.cxx
+++ b/Math/interpolater.cxx
@@ -24,7 +24,9 @@
 // (Log is kept at end of this file)
 
 
-#include <string>
+#include <Include/compiler.h>
+
+#include STL_STRING
 
 #include <Debug/logstream.hxx>
 #include <Include/fg_zlib.h>
@@ -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 9614faeda80b87f709482bb2452259da7637f3f0..2ecdfa6e4b521ad592437248e156fa354c5e798e 100644 (file)
--- a/Math/interpolater.hxx
+++ b/Math/interpolater.hxx
@@ -32,12 +32,15 @@
 # error This library requires C++
 #endif                                   
 
-
-#include <string>
-
 #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 a707acf906ed2642f43171d323c7d09d5fecc43d..5b3236c074fd80a95c70d79ff73164b982f7dcb7 100644 (file)
--- a/Misc/fgstream.hxx
+++ b/Misc/fgstream.hxx
@@ -32,20 +32,27 @@
 #  include "Include/config.h"
 #endif
 
-#include <string>
+#include <Include/compiler.h>
 
-#include "Include/compiler.h"
-#ifdef FG_HAVE_STD_INCLUDES
+#if defined( FG_HAVE_STD_INCLUDES )
 #  include <istream>
+#elif defined ( FG_HAVE_NATIVE_SGI_COMPILERS )
+#  include <CC/stream.h>
 #else
 #  include <istream.h>
 #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 d2e196af1be4c252a89e76822dffb4e07bd30b3c..6386f2ac78ea3e8f8136bdbada3143cf03fdbe0c 100644 (file)
--- a/Misc/strutils.hxx
+++ b/Misc/strutils.hxx
@@ -24,8 +24,8 @@
 #ifndef STRUTILS_H
 #define STRUTILS_H
 
-#include <string>
-#include "Include/compiler.h"
+#include <Include/compiler.h>
+#include STL_STRING
 
 #ifdef FG_HAVE_STD_INCLUDES
 #  include <cstdlib>
@@ -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 a2d82181c395d58336865c7c0e489be720305319..b76c37267f346916df0557b271e75beb7a401421 100644 (file)
--- 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 02e17a9b77529165ec33cc168ef1b502a87698bd..470e6ed538a462629aa9f3f9424f1813c58c944e 100644 (file)
--- a/Serial/serial.hxx
+++ b/Serial/serial.hxx
@@ -34,14 +34,19 @@
 #  include <config.h>
 #endif
 
-#include "Include/compiler.h"
-#include <string>
-FG_USING_STD(string);
-
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
 #  include <windows.h>
 #endif
 
+#include <Include/compiler.h>
+#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>
 
@@ -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:
 //