Changeset 3012 for trunk/gsdl

Timestamp:

2002-02-27T12:01:31+13:00 (22 years ago)

Author:

jrm21

Message:

istream.get(char&) caused funny problems with gcc3 so they've been replaced
with char=istream.get() instead.

Location:

trunk/gsdl/lib

Files:

• display.cpp (modified) (7 diffs)
• display.h (modified) (1 diff)

trunk/gsdl/lib/display.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.26  2002/02/26 23:01:31  jrm21
+   istream.get(char&) caused funny problems with gcc3 so they've been replaced
+   with char=istream.get() instead.
+
    Revision 1.25  2002/02/12 22:46:47  jrm21
    Allow nested _If_ macros. We now count '(' and ')' characters, so you can now
@@ -690 +694 @@
 // bigendian should be set to 1
 // 0 will be returned when the end of the file has been found
-unsigned short my_uni_get (unistream &fin, int &line, 
+unsigned short my_uni_get (/*unistream*/ifstream &fin, int &line, 
                int &isunicode, int &bigendian) {
   unsigned short c = 0;
@@ -699 +703 @@
     unsigned char c1 = 0, c2 = 0;
     
-    if (!fin.eof()) fin.get(c1);
-    if (!fin.eof()) fin.get(c2);
+    if (!fin.eof()) c1=fin.get();
+    if (!fin.eof()) c2=fin.get();
     else c1 = 0;
 
@@ -718 +722 @@
     unsigned char c1 = 0, c2 = 0, c3 = 0;
     while (!fin.eof()) {
-      fin.get(c1);
+      c1=fin.get();
       if (c1 == 0xfe || c1 == 0xff) {
     // switch to unicode
     isunicode = 1;
-    if (!fin.eof()) fin.get(c2);
+    if (!fin.eof()) c2=fin.get();
 
     if (c1 == 0xff && c2 == 0xfe) bigendian = 0;
@@ -737 +741 @@
       } else if (c1 >= 0xc0 && c1 <= 0xdf) {
     // two byte character
-    if (!fin.eof()) fin.get(c2);
+    if (!fin.eof()) c2=fin.get();
     c = ((c1 & 0x1f) << 6) + (c2 & 0x3f);
     break;
@@ -743 +747 @@
       } else if (c1 >= 0xe0 && c1 <= 0xef) {
     // three byte character
-    if (!fin.eof()) fin.get(c2);
-    if (!fin.eof()) fin.get(c3);
+    if (!fin.eof()) c2=fin.get();
+    if (!fin.eof()) c3=fin.get();
     c = ((c1 & 0xf) << 12) + ((c2 & 0x3f) << 6) + (c3 & 0x3f);
     break;
@@ -773 +777 @@
   
   // open the file
-  unistream fin (filenamestr);
+  //  unistream fin (filenamestr);
+  ifstream fin (filenamestr);
 
   if (fin.fail()) return -1; // read failed

trunk/gsdl/lib/display.h

@@ -64 +64 @@
 
 #define unistream ifstream
-
 #else
 #  include <iostream>