From ee937667fd0ecd82faab4c88d756b906fb625f1a Mon Sep 17 00:00:00 2001 From: sc Date: Tue, 28 Nov 2000 17:07:47 +0000 Subject: Integration into IvyLeague Uvh -> Ivl Multiplexer.* is renamed into Scheduler.* A few name conflicts in the merger with ex-DNN have been solved Imakefile is replaced by Makefile Created InetAddress.* and UnixAddress.* from Address.* Created IrdaAddress.* OLD/TextStream has been updated --- comm/IOS.h | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'comm/IOS.h') diff --git a/comm/IOS.h b/comm/IOS.h index 9f87478..828393f 100644 --- a/comm/IOS.h +++ b/comm/IOS.h @@ -10,24 +10,25 @@ * * $Id$ * $CurLog$ + * Removed global.h */ -#ifndef UchIO_H_ -#define UchIO_H_ +#ifndef IvlIO_H_ +#define IvlIO_H_ #ifdef __GNUG__ #pragma interface #endif #include "cplus_bugs.h" -#include "ccu/bool.h" -#include "ccu/word.h" -class CcuString; +#include "ivl/bool.h" +#include "ivl/word.h" +class IvlString; -class UchIOS { +class IvlIOS { public: - UchIOS (); -virtual ~UchIOS (); + IvlIOS (); +virtual ~IvlIOS (); virtual void WriteLong (lword) = 0; virtual void WriteShort (sword) = 0; @@ -42,21 +43,21 @@ virtual bool ReadByte (byte&) = 0; virtual bool ReadChar (char&) = 0; virtual bool ReadBuf (byte*, int) = 0; virtual int ReadString (char*, int = -1) = 0; -virtual int ReadString (CcuString&) = 0; +virtual int ReadString (IvlString&) = 0; -inline UchIOS& operator << (lword l) { WriteLong (l); return *this; } -inline UchIOS& operator << (sword s) { WriteShort (s); return *this; } -inline UchIOS& operator << (byte b) { WriteByte (b); return *this; } -inline UchIOS& operator << (char c) { WriteChar (c); return *this; } -inline UchIOS& operator << (const char* s) { WriteString (s); return *this; } +inline IvlIOS& operator << (lword l) { WriteLong (l); return *this; } +inline IvlIOS& operator << (sword s) { WriteShort (s); return *this; } +inline IvlIOS& operator << (byte b) { WriteByte (b); return *this; } +inline IvlIOS& operator << (char c) { WriteChar (c); return *this; } +inline IvlIOS& operator << (const char* s) { WriteString (s); return *this; } -inline UchIOS& operator >> (lword& l) { ReadLong (l); return *this; } -inline UchIOS& operator >> (sword& s) { ReadShort (s); return *this; } -inline UchIOS& operator >> (byte& b) { ReadByte (b); return *this; } -inline UchIOS& operator >> (char& c) { ReadChar (c); return *this; } -inline UchIOS& operator >> (char* s) { ReadString (s); return *this; } -inline UchIOS& operator >> (CcuString& s) { ReadString (s); return *this; } +inline IvlIOS& operator >> (lword& l) { ReadLong (l); return *this; } +inline IvlIOS& operator >> (sword& s) { ReadShort (s); return *this; } +inline IvlIOS& operator >> (byte& b) { ReadByte (b); return *this; } +inline IvlIOS& operator >> (char& c) { ReadChar (c); return *this; } +inline IvlIOS& operator >> (char* s) { ReadString (s); return *this; } +inline IvlIOS& operator >> (IvlString& s) { ReadString (s); return *this; } }; -#endif /* UchIO_H_ */ +#endif /* IvlIO_H_ */ -- cgit v1.1