Changeset 12793

Timestamp:

2006-09-20T13:31:31+12:00 (18 years ago)

Author:

kjdon

Message:

gcc-4 compilation patch, thanks to Juan Grigera

Location:

trunk/gsdl

Files:

• lib/display.h (modified) (1 diff)
• src/phind/generate/phrase.h (modified) (3 diffs)

trunk/gsdl/lib/display.h

@@ -269 +269 @@
   // say where any error logging goes, this can be NULL
   // if no error logging is desired - returns previous value
-  ostream *displayclass::setlogout (ostream *thelogout);
+  ostream *setlogout (ostream *thelogout);
 
   // debug stuff

trunk/gsdl/src/phind/generate/phrase.h

@@ -114 +114 @@
 
   // Make sure the phrase location in the suffix/prefix array is known
-  inline void Phrase::ensureSuffixFound() {
+  inline void ensureSuffixFound() {
     if (!suffixFound)
       findFirstAndLastSuffix();
   }
-  inline void Phrase::ensurePrefixFound() {
+  inline void ensurePrefixFound() {
     if (!prefixFound)
       findFirstAndLastPrefix();
@@ -142 +142 @@
 
   // increase the length of a phrase "in place"
-  int Phrase::increaseSuffixLength(cellcount l);
-  int Phrase::increasePrefixLength(cellcount l);
+  int increaseSuffixLength(cellcount l);
+  int increasePrefixLength(cellcount l);
     
   // Compare the phrase to a given array of symbols
@@ -150 +150 @@
 
   // Create a new phrase that is longer than this one, yet as short as possible.
-  Phrase Phrase::newPhraseShortestSuffixExpansion(cellindex i);
-  Phrase Phrase::newPhraseShortestPrefixExpansion(cellindex i);
+  Phrase newPhraseShortestSuffixExpansion(cellindex i);
+  Phrase newPhraseShortestPrefixExpansion(cellindex i);
 
 };