Changeset 2468 for trunk/gsdl/src/mgpp/text/mg_fast_comp_dict.cpp

Timestamp:

2001-05-24T17:06:48+12:00 (23 years ago)

Author:

sjboddie

Message:

Fiddled about with mgpp to get it compiling on Windows under VC++ 6.0. I
still can't get it to compile under VC++ 4.2 because of some weird
behaviour in STLport.

Also tidied up a little and removed some of the old log information
that was scattered about in some of the files.

File:

• trunk/gsdl/src/mgpp/text/mg_fast_comp_dict.cpp (modified) (3 diffs)

trunk/gsdl/src/mgpp/text/mg_fast_comp_dict.cpp

@@ -18 +18 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
- *
  **************************************************************************/
-
-
-/*
-   $Log$
-   Revision 1.3  2001/05/17 04:38:15  jrm21
-   portability changes, use getopt from unistd.h (all POSIX systems)
-
-   Revision 1.2  2000/01/18 03:53:23  rjmcnab
-   Fixed a couple of bugs and made building silent if needed.
-
-   Revision 1.1  2000/01/14 02:26:13  sjboddie
-   Rodgers new C++ mg
-
-   Revision 1.2  1999/10/17 23:43:26  cs025
-   Changes to eradicate Xmalloc
-
-   Revision 1.1  1999/10/11 02:57:50  cs025
-   Base install of MG-PP
-
-   Revision 1.1  1999/08/10 21:18:06  sjboddie
-   renamed mg-1.3d directory mg
-
-   Revision 1.2  1998/11/25 07:55:44  rjmcnab
-
-   Modified mg to that you can specify the stemmer you want
-   to use via a command line option. You specify it to
-   mg_passes during the build process. The number of the
-   stemmer that you used is stored within the inverted
-   dictionary header and the stemmed dictionary header so
-   the correct stemmer is used in later stages of building
-   and querying.
-
-   Revision 1.1  1998/11/17 09:34:57  rjmcnab
-   *** empty log message ***
-
-   * Revision 1.3  1994/10/20  03:56:55  tes
-   * I have rewritten the boolean query optimiser and abstracted out the
-   * components of the boolean query.
-   *
-   * Revision 1.2  1994/09/20  04:41:47  tes
-   * For version 1.1
-   *
- */
 
 #define _XOPEN_SOURCE 1
 #define _XOPEN_SOURCE_EXTENDED 1
-#include <unistd.h>
+
+// need this to avoid bizarre compiler problems under VC++ 6.0
+#if defined (__WIN32__) && !defined (GSDL_USE_IOS_H)
+# include <iostream>
+#endif
+
+#if defined (__WIN32__)
+# include "getopt.h"
+#else
+# include <unistd.h>
+#endif
 
 #include "sysfuncs.h"
-
 #include "huffman.h"
 #include "messages.h"
@@ -212 +176 @@
   save_fast_dict (filename);
 
-  exit (0);
+  return (0);
 }
 
@@ -708 +672 @@
 }
 
-
 static void 
 save_fast_dict (char *filename)