Changeset 6189

Timestamp:

2003-12-10T13:16:58+13:00 (20 years ago)

Author:

jrm21

Message:

fixes so it compiles with gcc 3 as well as gcc 2.9x

Location:

trunk/gsdl/packages/isis-gdl

Files:

• CRC32.cpp (modified) (1 diff)
• IsisTypes.h (modified) (1 diff)
• Master.cpp (modified) (1 diff)

trunk/gsdl/packages/isis-gdl/CRC32.cpp

@@ -98 +98 @@
 
  while(!infile.eof()) {
-   infile.get(c);
+   c=infile.get();
    i = (unsigned int)c;
    i &= 0xFF; // Reset all the bits

trunk/gsdl/packages/isis-gdl/IsisTypes.h

@@ -48 +48 @@
 typedef short           int16_t;   // short word (2 bytes)
 typedef unsigned short  uint16_t;  // Unsigned short word (2 bytes)
+#ifndef __USE_ISOC99 // gnu lic math.h has a double_t
 typedef double          double_t;  // Double precision floating point (8 bytes)
+#endif
 
 

trunk/gsdl/packages/isis-gdl/Master.cpp

@@ -146 +146 @@
     if (!s.good()) return s;
 
-    ios::iostate err = 0;
+    ios::iostate err = ios::goodbit;
     try
     {