Integration into IvyLeague

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

1 files changed, 37 insertions, 42 deletions

diff --git a/dnn/Loop.cc b/dnn/Loop.cc
index a655e8b..472457a 100755
--- a/dnn/Loop.cc
+++ b/dnn/Loop.cc
@@ -14,24 +14,24 @@
 
 #include "Loop.h"
 
-CcuInitializerFor<DnnBaseMultiplexer> DnnBaseMultiplexer::Initializer;
-bool DnnBaseMultiplexer::ClassInitialized = false;
-CcuList* DnnBaseMultiplexer::GlobalHooks = 0;
-CcuList* DnnBaseMultiplexer::GlobalFinalHooks = 0;
-DnnBaseMultiplexer* DnnMpx = 0;
+IvlInitializerFor<IvlBaseMultiplexer> IvlBaseMultiplexer::Initializer;
+bool IvlBaseMultiplexer::ClassInitialized = false;
+IvlList* IvlBaseMultiplexer::GlobalHooks = 0;
+IvlList* IvlBaseMultiplexer::GlobalFinalHooks = 0;
+IvlBaseMultiplexer* IvlMpx = 0;
 
 void
-DnnBaseMultiplexer :: ClassInit ()
+IvlBaseMultiplexer :: ClassInit ()
 {
 	if (!ClassInitialized) {
 		ClassInitialized = true;
-		GlobalHooks = new CcuList;
-		GlobalFinalHooks = new CcuList;
+		GlobalHooks = new IvlList;
+		GlobalFinalHooks = new IvlList;
 	}
 }
 
 void
-DnnBaseMultiplexer :: AddGlobalHook (DnnMpxHook* h, bool final)
+IvlBaseMultiplexer :: AddGlobalHook (IvlMpxHook* h, bool final)
 {
 	GlobalHooks->Append ((void*) h);
 	if (final)
@@ -39,43 +39,41 @@ DnnBaseMultiplexer :: AddGlobalHook (DnnMpxHook* h, bool final)
 }
 
 void
-DnnBaseMultiplexer :: RemoveGlobalHook (DnnMpxHook* h, bool final)
+IvlBaseMultiplexer :: RemoveGlobalHook (IvlMpxHook* h, bool final)
 {
 	GlobalHooks->Remove ((void*) h);
 	if (final)
 		GlobalFinalHooks->Remove ((void*) h);
 }
 
-
-DnnBaseMultiplexer :: DnnBaseMultiplexer ()
+IvlBaseMultiplexer :: IvlBaseMultiplexer ()
 {
 }
 
-DnnBaseMultiplexer :: ~DnnBaseMultiplexer ()
+IvlBaseMultiplexer :: ~IvlBaseMultiplexer ()
 {
 }
 
 /* useless? */
 MPX_RES
-DnnBaseMultiplexer :: Run ()
+IvlBaseMultiplexer :: Run ()
 {
 	return Loop ();
 }
 
-
-DnnMultiplexer :: DnnMultiplexer ()
-: DnnBaseMultiplexer (),
+IvlMultiplexer :: IvlMultiplexer ()
+: IvlBaseMultiplexer (),
   Hooks (),
   FinalHooks ()
 {
 }
 
-DnnMultiplexer :: ~DnnMultiplexer ()
+IvlMultiplexer :: ~IvlMultiplexer ()
 {
 }
 
 void
-DnnMultiplexer :: AddHook (DnnMpxHook* h, bool final)
+IvlMultiplexer :: AddHook (IvlMpxHook* h, bool final)
 {
 	Hooks.Append ((void*) h);
 	if (final)
@@ -83,7 +81,7 @@ DnnMultiplexer :: AddHook (DnnMpxHook* h, bool final)
 }
 
 void
-DnnMultiplexer :: RemoveHook (DnnMpxHook* h, bool final)
+IvlMultiplexer :: RemoveHook (IvlMpxHook* h, bool final)
 {
 	Hooks.Remove ((void*) h);
 	if (final)
@@ -91,31 +89,30 @@ DnnMultiplexer :: RemoveHook (DnnMpxHook* h, bool final)
 }
 
 void
-DnnMultiplexer :: AddFinalHook (DnnMpxHook* h)
+IvlMultiplexer :: AddFinalHook (IvlMpxHook* h)
 {
 	FinalHooks.Append ((void*) h);
 }
 
 void
-DnnMultiplexer :: RemoveFinalHook (DnnMpxHook* h)
+IvlMultiplexer :: RemoveFinalHook (IvlMpxHook* h)
 {
 	FinalHooks.Remove ((void*) h);
 }
 
-
 void
-DnnMultiplexer :: ExecHooks (bool final)
+IvlMultiplexer :: ExecHooks (bool final)
 {
-	CcuList* hooks = final ? &FinalHooks : &Hooks;
-	CcuListIter li = *hooks;
+	IvlList* hooks = final ? &FinalHooks : &Hooks;
+	IvlListIter li = *hooks;
 	while (++li) {
-		DnnMpxHook* h = (DnnMpxHook*) *li;
+		IvlMpxHook* h = (IvlMpxHook*) *li;
 		(*h)();
 	}
 }
 
 MPX_RES
-DnnMultiplexer :: Loop ()
+IvlMultiplexer :: Loop ()
 {
 	Looping = true;
 	while (Looping)
@@ -125,41 +122,39 @@ DnnMultiplexer :: Loop ()
 }
 
 void
-DnnMultiplexer :: Stop ()
+IvlMultiplexer :: Stop ()
 {
 	Looping = false;
 }
 
-
 void
-DnnOpen (DnnBaseMultiplexer* m)
+IvlDnnOpen (IvlBaseMultiplexer* m)
 {
-	DnnMpx = m ? m : new DnnMultiplexer;
+	IvlMpx = m ? m : new IvlMultiplexer;
 
-	CcuListIter li = *DnnBaseMultiplexer::GlobalHooks;
+	IvlListIter li = *IvlBaseMultiplexer::GlobalHooks;
 	while (++li)
-		DnnMpx->AddHook ((DnnMpxHook*) *li, false);
+		IvlMpx->AddHook ((IvlMpxHook*) *li, false);
 
-	li = *DnnBaseMultiplexer::GlobalFinalHooks;
+	li = *IvlBaseMultiplexer::GlobalFinalHooks;
 	while (++li)
-		DnnMpx->AddFinalHook ((DnnMpxHook*) *li);
+		IvlMpx->AddFinalHook ((IvlMpxHook*) *li);
 }
 
 MPX_RES
-DnnLoop ()
+IvlLoop ()
 {
-	return DnnMpx->Loop ();
+	return IvlMpx->Loop ();
 }
 
 void
-DnnStop ()
+IvlStop ()
 {
-	DnnMpx->Stop ();
+	IvlMpx->Stop ();
 }
 
 void
-DnnClose ()
+IvlClose ()
 {
 }
 
-