From: Christian P. <cp...@us...> - 2004-12-23 04:32:27
|
Update of /cvsroot/pclasses/pclasses2/include/pclasses/System In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14702/include/pclasses/System Modified Files: File.h Pipe.h SharedLib.h SystemError.h Log Message: Moved IODevice, IOError into P::IO namespace. Moved Char, String, TextStream into P::Unicode namespace. Index: Pipe.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/Pipe.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- Pipe.h 22 Dec 2004 17:54:41 -0000 1.1.1.1 +++ Pipe.h 23 Dec 2004 04:32:17 -0000 1.2 @@ -22,32 +22,32 @@ #define P_System_Pipe_h #include <pclasses/Pair.h> -#include <pclasses/IODevice.h> +#include <pclasses/IO/IODevice.h> namespace P { namespace System { //! Anonymous pipe device -class Pipe: public IODevice { +class Pipe: public IO::IODevice { public: typedef P::Pair<Pipe> Pair; - Pipe(const Pipe& f) throw(IOError); + Pipe(const Pipe& f) throw(IO::IOError); ~Pipe() throw(); - static Pair create() throw(IOError); + static Pair create() throw(IO::IOError); - void close() throw(LogicError, IOError); + void close() throw(LogicError, IO::IOError); - size_t read(char* buffer, size_t count) throw(IOError); + size_t read(char* buffer, size_t count) throw(IO::IOError); - size_t write(const char* buffer, size_t count) throw(IOError); + size_t write(const char* buffer, size_t count) throw(IO::IOError); - void commit() const throw(IOError); + void commit() const throw(IO::IOError); - Pipe& operator=(const Pipe& f) throw(IOError); + Pipe& operator=(const Pipe& f) throw(IO::IOError); private: struct Handle; Index: SystemError.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/SystemError.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- SystemError.h 22 Dec 2004 17:54:42 -0000 1.1.1.1 +++ SystemError.h 23 Dec 2004 04:32:17 -0000 1.2 @@ -23,7 +23,7 @@ #include <pclasses/SourceInfo.h> #include <pclasses/Exception.h> -#include <pclasses/String.h> +#include <pclasses/Unicode/String.h> namespace P { @@ -50,7 +50,7 @@ long errorNo() const throw(); //! Returns the system error text - String text() const throw(); + Unicode::String text() const throw(); private: long _errorNo; Index: SharedLib.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/SharedLib.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- SharedLib.h 22 Dec 2004 17:54:41 -0000 1.1.1.1 +++ SharedLib.h 23 Dec 2004 04:32:17 -0000 1.2 @@ -22,7 +22,7 @@ #define P_System_SharedLib_h #include <pclasses/NonCopyable.h> -#include <pclasses/String.h> +#include <pclasses/Unicode/String.h> #include <pclasses/System/SystemError.h> namespace P { @@ -58,7 +58,7 @@ \param mode binding mode when loading the library \throw SystemError */ - SharedLib(const String& name, BindMode mode = BindLazy) + SharedLib(const Unicode::String& name, BindMode mode = BindLazy) throw(SystemError); //! Destructor Index: File.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/File.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- File.h 22 Dec 2004 17:54:41 -0000 1.1.1.1 +++ File.h 23 Dec 2004 04:32:16 -0000 1.2 @@ -21,43 +21,43 @@ #ifndef P_System_File_h #define P_System_File_h -#include <pclasses/IODevice.h> +#include <pclasses/IO/IODevice.h> namespace P { namespace System { -class File: public IODevice { +class File: public IO::IODevice { public: File() throw(); - File(const File& f) throw(IOError); + File(const File& f) throw(IO::IOError); File(const char* name, OpenMode omode, AccessMode amode, - ShareMode smode) throw(IOError); + ShareMode smode) throw(IO::IOError); ~File() throw(); void open(const char* name, OpenMode omode, AccessMode amode, - ShareMode smode) throw(LogicError, IOError); + ShareMode smode) throw(LogicError, IO::IOError); - void close() throw(LogicError, IOError); + void close() throw(LogicError, IO::IOError); - size_t read(char* buffer, size_t count) throw(IOError); + size_t read(char* buffer, size_t count) throw(IO::IOError); - size_t peek(char* buffer, size_t count) throw(IOError); + size_t peek(char* buffer, size_t count) throw(IO::IOError); - size_t write(const char* buffer, size_t count) throw(IOError); + size_t write(const char* buffer, size_t count) throw(IO::IOError); - offset_t seek(offset_t offset, SeekMode mode) throw(IOError); + offset_t seek(offset_t offset, SeekMode mode) throw(IO::IOError); bool isSeekable() const throw(); - void commit() const throw(IOError); + void commit() const throw(IO::IOError); - offset_t size() const throw(IOError); + offset_t size() const throw(IO::IOError); - File& operator=(const File& f) throw(IOError); + File& operator=(const File& f) throw(IO::IOError); private: struct Handle; |