plib-cvs

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/src/psl
In directory usw-pr-cvs1:/tmp/cvs-serv7620

Modified Files:
	pslFileIO.cxx 
Log Message:
Removed some global namespace pollution from PSL; Const-correctness

Index: pslFileIO.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/psl/pslFileIO.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pslFileIO.cxx	10 Sep 2002 04:37:39 -0000	1.1
+++ pslFileIO.cxx	10 Sep 2002 23:02:35 -0000	1.2
@@ -26,8 +26,8 @@
 
 class pslFile ;
 
-pslFile *defaultFileStack [ MAX_INCLUDE_DEPTH ] ;
-int      fileStackPointer = 0 ;
+static pslFile *defaultFileStack [ MAX_INCLUDE_DEPTH ] ;
+static int      fileStackPointer = 0 ;
 
 class pslFile
 {
@@ -107,20 +107,20 @@
     return c ;
   }
 
-  int   getLineNo () { return line_no ; }
-  char *getFname  () { return fname   ; }
+  int   getLineNo () const { return line_no ; }
+  char *getFname  () const { return fname   ; }
 } ;
 
 
-char *getFname ()
+char *_pslGetFname ()
         { return defaultFileStack [ fileStackPointer - 1 ] -> getFname () ; } 
-int  getLineNo ()
+int  _pslGetLineNo ()
         { return defaultFileStack [ fileStackPointer - 1 ] -> getLineNo () ; } 
 
-void popDefaultFile  () { delete defaultFileStack [ fileStackPointer - 1 ] ; } 
-void pushDefaultFile ( FILE *fd, const char *fname ) { new pslFile ( fd, fname ) ; }
+void _pslPopDefaultFile  () { delete defaultFileStack [ fileStackPointer - 1 ] ; } 
+void _pslPushDefaultFile ( FILE *fd, const char *fname ) { new pslFile ( fd, fname ) ; }
 
-void pushDefaultFile ( const char *fname )
+void _pslPushDefaultFile ( const char *fname )
 {
   FILE *fd = fopen ( fname, "ra" ) ;
 
@@ -130,12 +130,12 @@
     return ;
   }
 
-  pushDefaultFile ( fd, fname ) ;
+  _pslPushDefaultFile ( fd, fname ) ;
 }
 
 
 
-int getChar ()
+int _pslGetChar ()
 {
   /* WARNING -- RECURSIVE -- WARNING -- RECURSIVE -- WARNING -- RECURSIVE */
 
@@ -151,8 +151,8 @@
   {
     if ( fileStackPointer > 1 )
     {
-      popDefaultFile () ;
-      return getChar () ;
+      _pslPopDefaultFile () ;
+      return _pslGetChar () ;
     }
 
     return -1 ;
@@ -162,7 +162,7 @@
 }
 
 
-void unGetChar ( int c )
+void _pslUnGetChar ( int c )
 {
   defaultFileStack [ fileStackPointer-1 ] -> unGetChar ( c ) ;
 }