Integration into IvyLeague

Dnn -> Ivl
Some class names changed, because of conflicts with previous Uch classes
Imakefile is replaced with Makefile

1 files changed, 35 insertions, 36 deletions

diff --git a/dnn/Loop.h b/dnn/Loop.h
index 9009c39..55dcafc 100644
--- a/dnn/Loop.h
+++ b/dnn/Loop.h
@@ -12,71 +12,70 @@
  *	$CurLog$
  */
 
-#ifndef DnnMultiplexer_H_
-#define DnnMultiplexer_H_
+#ifndef IvlMultiplexer_H_
+#define IvlMultiplexer_H_
 
-#include "ccu/Initializer.h"
-#include "ccu/List.h"
+#include "ivl/Initializer.h"
+#include "ivl/List.h"
 
 enum MPX_RES { isMpxEmpty, isMpxTerminated, isMpxError, isMpxAborted };
 
-typedef void (DnnMpxHook) ();
+typedef void (IvlMpxHook) ();
 
-class DnnBaseMultiplexer {
-friend	void	DnnOpen (DnnBaseMultiplexer*);
-friend	MPX_RES	DnnLoop ();
-friend	void	DnnClose ();
+class IvlBaseMultiplexer {
+friend	void	IvlDnnOpen (IvlBaseMultiplexer*);
+friend	MPX_RES	IvlLoop ();
+friend	void	IvlClose ();
 
 public:
 static	bool	ClassInitialized;
 static	void	ClassInit ();
-static	CcuInitializerFor <DnnBaseMultiplexer>	Initializer;
+static	IvlInitializerFor <IvlBaseMultiplexer>	Initializer;
 
 protected:
-static	CcuList*	GlobalHooks;
-static	CcuList*	GlobalFinalHooks;
+static	IvlList*	GlobalHooks;
+static	IvlList*	GlobalFinalHooks;
 virtual	MPX_RES	Loop () = 0;
 
 public:
-		DnnBaseMultiplexer ();
-virtual		~DnnBaseMultiplexer ();
+		IvlBaseMultiplexer ();
+virtual		~IvlBaseMultiplexer ();
 
 	MPX_RES	Run ();
 virtual	void	Stop () = 0;
 
-static	void	AddGlobalHook (DnnMpxHook*, bool = false);
-static	void	RemoveGlobalHook (DnnMpxHook*, bool = false);
-virtual	void	AddHook (DnnMpxHook*, bool = false) = 0;
-virtual	void	RemoveHook (DnnMpxHook*, bool = false) = 0;
-virtual	void	AddFinalHook (DnnMpxHook*) = 0;
-virtual	void	RemoveFinalHook (DnnMpxHook*) = 0;
+static	void	AddGlobalHook (IvlMpxHook*, bool = false);
+static	void	RemoveGlobalHook (IvlMpxHook*, bool = false);
+virtual	void	AddHook (IvlMpxHook*, bool = false) = 0;
+virtual	void	RemoveHook (IvlMpxHook*, bool = false) = 0;
+virtual	void	AddFinalHook (IvlMpxHook*) = 0;
+virtual	void	RemoveFinalHook (IvlMpxHook*) = 0;
 };
 
-class DnnMultiplexer : public DnnBaseMultiplexer {
+class IvlMultiplexer : public IvlBaseMultiplexer {
 protected:
-	CcuList	Hooks;
-	CcuList	FinalHooks;
+	IvlList	Hooks;
+	IvlList	FinalHooks;
 	bool	Looping;
 
 	void	ExecHooks (bool = false);
 	MPX_RES	Loop ();
 
 public:
-		DnnMultiplexer ();
-		~DnnMultiplexer ();
+		IvlMultiplexer ();
+		~IvlMultiplexer ();
 	void	Stop ();
-	void	AddHook (DnnMpxHook*, bool = false);
-	void	RemoveHook (DnnMpxHook*, bool = false);
-	void	AddFinalHook (DnnMpxHook*);
-	void	RemoveFinalHook (DnnMpxHook*);
+	void	AddHook (IvlMpxHook*, bool = false);
+	void	RemoveHook (IvlMpxHook*, bool = false);
+	void	AddFinalHook (IvlMpxHook*);
+	void	RemoveFinalHook (IvlMpxHook*);
 };
 
+extern IvlBaseMultiplexer* IvlMpx;
+extern void IvlDnnOpen (IvlBaseMultiplexer* = 0);
+extern MPX_RES IvlLoop ();
+extern void IvlStop ();
+extern void IvlClose ();
 
-extern DnnBaseMultiplexer* DnnMpx;
-extern void DnnOpen (DnnBaseMultiplexer* = 0);
-extern MPX_RES DnnLoop ();
-extern void DnnStop ();
-extern void DnnClose ();
 
-
-#endif	/* DnnMultiplexer_H_ */
+#endif	/* IvlMultiplexer_H_ */