[pclasses-cvs] pclasses2/include/pclasses/System File.h,1.2,1.3 Pipe.h,1.2,1.3

[Christian P. <cp...@us...>]

Update of /cvsroot/pclasses/pclasses2/include/pclasses/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31672/include/pclasses/System

Modified Files:
	File.h Pipe.h 
Log Message:
Converted File::_handle, Pipe::_handle to unsigned long type. Added
std::string support to File.


Index: Pipe.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/Pipe.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Pipe.h	23 Dec 2004 04:32:17 -0000	1.2
+++ Pipe.h	23 Dec 2004 05:56:09 -0000	1.3
@@ -50,10 +50,8 @@
 		Pipe& operator=(const Pipe& f) throw(IO::IOError);
 
 	private:
-		struct Handle;
-		Handle* _handle;
-
-		Pipe(Handle* h, bool readEnd) throw();
+		unsigned long _handle;
+		Pipe(unsigned long h, bool readEnd) throw();
 };
 
 } // !namespace System

Index: File.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/File.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- File.h	23 Dec 2004 04:32:16 -0000	1.2
+++ File.h	23 Dec 2004 05:56:09 -0000	1.3
@@ -21,8 +21,13 @@
 #ifndef P_System_File_h
 #define P_System_File_h
 
+#include <pclasses/Unicode/String.h>
 #include <pclasses/IO/IODevice.h>
 
+#ifdef PCLASSES_WITH_STL
+#  include <string>
+#endif
+
 namespace P {
 
 namespace System {
@@ -33,14 +38,24 @@
 
 		File(const File& f) throw(IO::IOError);
 
-		File(const char* name, OpenMode omode, AccessMode amode, 
+		File(const Unicode::String& name, OpenMode omode, AccessMode amode, 
+			ShareMode smode) throw(IO::IOError);
+
+#ifdef PCLASSES_WITH_STL
+		File(const std::string& name, OpenMode omode, AccessMode amode, 
 			ShareMode smode) throw(IO::IOError);
+#endif
 
 		~File() throw();
 
-		void open(const char* name, OpenMode omode, AccessMode amode, 
+		void open(const Unicode::String& name, OpenMode omode, AccessMode amode, 
 			ShareMode smode) throw(LogicError, IO::IOError);
 
+#ifdef PCLASSES_WITH_STL
+		void open(const std::string& name, OpenMode omode, AccessMode amode, 
+			ShareMode smode) throw(LogicError, IO::IOError);
+#endif
+
 		void close() throw(LogicError, IO::IOError);
 
 		size_t read(char* buffer, size_t count) throw(IO::IOError);
@@ -60,8 +75,7 @@
 		File& operator=(const File& f) throw(IO::IOError);
 
 	private:
-		struct Handle;
-		Handle* _handle;
+		unsigned long _handle;
 };
 
 } // !namespace System