Changeset 2498 for trunk

Timestamp:

2001-06-06T16:43:14+12:00 (23 years ago)

Author:

sjboddie

Message:

A couple of small changes to phind's generate code to get it working
under windows 95

Location:

trunk/gsdl/src/phind/generate

Files:

• phrase.h (modified) (1 diff)
• suffix.cpp (modified) (7 diffs)

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

@@ -28 +28 @@
 #ifndef PHRASE_H
 #define PHRASE_H
+
+// use the standard namespace
+#if !defined (GSDL_NAMESPACE_BROKEN)
+#if defined(GSDL_USE_OBJECTSPACE)
+using namespace ospace::std;
+#else
+using namespace std;
+#endif
+#endif
 
 #if defined(GSDL_USE_STL_H)

trunk/gsdl/src/phind/generate/suffix.cpp

@@ -52 +52 @@
 #  include <vector>
 #endif
-#include <stl_heap.h>
-
 
 #include "suffix.h"
@@ -246 +244 @@
   }
 
-  // We need an input file, for phrases we are about to examine, and an 
-  // output file, for phrases still to come.
-  ifstream inPhrase;
-  char     inPhraseName[FILENAME_MAX];
   ofstream outPhrase;
   char     outPhraseName[FILENAME_MAX];
@@ -368 +362 @@
 
     // Open the input file
+    char inPhraseName[FILENAME_MAX];
     sprintf(inPhraseName, "%s/outPhrase.%d", collection, phrasePass - 1);
-    inPhrase.open(inPhraseName, ios::in);
+    ifstream inPhrase (inPhraseName, ios::in);
     if (!inPhrase) {
       cerr << "File " << inPhraseName << " could not be opened\n";
@@ -698 +693 @@
 
   // Open the numbers file
-  ifstream inFile(filename, ios::in);
-  if (!inFile) {
+  ifstream inFile1(filename, ios::in);
+  if (!inFile1) {
     cerr << "File " << filename << " could not be opened\n";
     exit(1);
@@ -707 +702 @@
   inputLength = 0;
   symbol word;
-  while (inFile >> word) {
+  while (inFile1 >> word) {
     inputLength++;
   }
-  inFile.close();
+  inFile1.close();
 
   // Allocate the symbbols array
@@ -727 +722 @@
     cout << "Reading the numbers" << endl;
   }
-  inFile.open(filename, ios::in);
+
+  ifstream inFile2(filename, ios::in);
+  if (!inFile2) {
+    cerr << "File " << filename << " could not be opened\n";
+    exit(1);
+  }
   cellcount next = 0;
   numberOfDocuments = 0;
-  while (inFile >> word) {
+  while (inFile2 >> word) {
     symbols[next++] = word;
     if (word == DOCUMENTSTART) {
@@ -736 +736 @@
     }
   }
-  inFile.close();
+  inFile2.close();
   
   // Make sure the numbers file is intact