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/MsgBuffer.h | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'comm/MsgBuffer.h')

diff --git a/comm/MsgBuffer.h b/comm/MsgBuffer.h
index 442787e..24d201a 100644
--- a/comm/MsgBuffer.h
+++ b/comm/MsgBuffer.h
@@ -10,23 +10,25 @@
  *
  *	$Id$
  *	$CurLog$
+ *	Removed smart pointers
+ *	Removed global.h
  */
 
 #ifndef Buffer_H_
 #define Buffer_H_
 
 #include "cplus_bugs.h"
-#include "ccu/bool.h"
-#include "ccu/word.h"
+#include "ivl/bool.h"
+#include "ivl/word.h"
 #include "IOS.h"
-class CcuString;
-class UchMessage;
+class IvlString;
+class IvlMessage;
 
 //	Buffer is the buffer itself, End points after its last byte
 //	Start and Stop limit its content
 //	a buffer grows and shrinks automatically
 //
-class UchMsgBuffer : public UchIOS {
+class IvlMsgBuffer : public IvlIOS {
 protected:
 	byte*	Begin;
 	byte*	Start;
@@ -39,11 +41,11 @@ protected:
 	int	GetString (char*, int, const char*, bool, int = 0);
 
 public:
-		UchMsgBuffer ();
-		UchMsgBuffer (int);
-		UchMsgBuffer (int, int, int);
-		UchMsgBuffer (const UchMsgBuffer&, int = 0);	// construct a fake buffer
-		~UchMsgBuffer ();
+		IvlMsgBuffer ();
+		IvlMsgBuffer (int);
+		IvlMsgBuffer (int, int, int);
+		IvlMsgBuffer (const IvlMsgBuffer&, int = 0);	// construct a fake buffer
+		~IvlMsgBuffer ();
 	
 	void	Clear ();
 	void	NeedSize (int n);
@@ -67,11 +69,11 @@ public:
 	int	ReadString (char*, const char*, int = -1);
 	int	ReadString (char*, char, int = -1);
 	int	ReadString (char*, int = -1);
-	int	ReadString (CcuString&);
-	bool	ReadMsg (UchMessage&);
+	int	ReadString (IvlString&);
+	bool	ReadMsg (IvlMessage&);
 
 	void	Append (const char*, bool = true);
-	void	WriteMsg (UchMessage&);
+	void	WriteMsg (IvlMessage&);
 
 	bool	PeekByte (byte&, int = 0);
 	bool	PeekShort (sword&, int = 0);
@@ -79,7 +81,7 @@ public:
 	bool	PeekBuf (byte*, int, int = 0);
 	int	PeekString (char*, int=-1, const char* = 0, int = 0);
 	int	PeekString (char*, int, char, int = 0);
-	int	PeekString (CcuString&, int = 0);
+	int	PeekString (IvlString&, int = 0);
 	
 	byte*	Buffer ()		{ return Start; }
 	int	BufLength ()	{ return Stop - Start; }
@@ -93,12 +95,12 @@ public:
 	void	ResetError ()		{ GetErr = false; }
 	
 #ifdef DOC
-	UchMsgBuffer&	operator << (type data);
-	UchMsgBuffer&	operator >> (type& data);
-	UchMsgBuffer&	operator >> (type* data);
+	IvlMsgBuffer&	operator << (type data);
+	IvlMsgBuffer&	operator >> (type& data);
+	IvlMsgBuffer&	operator >> (type* data);
 #endif
 
-friend	UchMsgBuffer&	DbgPrint (UchMsgBuffer&, int);
+friend	IvlMsgBuffer&	DbgPrint (IvlMsgBuffer&, int);
 };
 
 #endif /* Buffer_H_ */
-- 
cgit v1.1