1 files changed, 20 insertions, 15 deletions

diff --git a/src/aig/dch/dchClass.c b/src/aig/dch/dchClass.c
index 9f4bd68c..83a3bc2e 100644
--- a/src/aig/dch/dchClass.c
+++ b/src/aig/dch/dchClass.c
@@ -20,6 +20,9 @@
 
 #include "dchInt.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
     The candidate equivalence classes are stored as a vector of pointers 
     to the array of pointers to the nodes in each class.
@@ -280,10 +283,10 @@ void Dch_ClassesPrintOne( Dch_Cla_t * p, Aig_Obj_t * pRepr )
 {
     Aig_Obj_t * pObj;
     int i;
-    printf( "{ " );
+    Abc_Print( 1, "{ " );
     Dch_ClassForEachNode( p, pRepr, pObj, i )
-        printf( "%d(%d,%d) ", pObj->Id, pObj->Level, Aig_SupportSize(p->pAig,pObj) );
-    printf( "}\n" );
+        Abc_Print( 1, "%d(%d,%d) ", pObj->Id, pObj->Level, Aig_SupportSize(p->pAig,pObj) );
+    Abc_Print( 1, "}\n" );
 }
 
 /**Function*************************************************************
@@ -302,21 +305,21 @@ void Dch_ClassesPrint( Dch_Cla_t * p, int fVeryVerbose )
     Aig_Obj_t ** ppClass;
     Aig_Obj_t * pObj;
     int i;
-    printf( "Equivalence classes: Const1 = %5d. Class = %5d. Lit = %5d.\n", 
+    Abc_Print( 1, "Equivalence classes: Const1 = %5d. Class = %5d. Lit = %5d.\n", 
         p->nCands1, p->nClasses, p->nLits );
     if ( !fVeryVerbose )
         return;
-    printf( "Constants { " );
+    Abc_Print( 1, "Constants { " );
     Aig_ManForEachObj( p->pAig, pObj, i )
         if ( Dch_ObjIsConst1Cand( p->pAig, pObj ) )
-            printf( "%d(%d,%d) ", pObj->Id, pObj->Level, Aig_SupportSize(p->pAig,pObj) );
-    printf( "}\n" );
+            Abc_Print( 1, "%d(%d,%d) ", pObj->Id, pObj->Level, Aig_SupportSize(p->pAig,pObj) );
+    Abc_Print( 1, "}\n" );
     Dch_ManForEachClass( p, ppClass, i )
     {
-        printf( "%3d (%3d) : ", i, p->pClassSizes[i] );
+        Abc_Print( 1, "%3d (%3d) : ", i, p->pClassSizes[i] );
         Dch_ClassesPrintOne( p, ppClass[0] );
     }
-    printf( "\n" );
+    Abc_Print( 1, "\n" );
 }
 
 /**Function*************************************************************
@@ -456,20 +459,20 @@ int Dch_ClassesRefineOneClass( Dch_Cla_t * p, Aig_Obj_t * pReprOld, int fRecursi
         return 0;
 
     // get the new representative
-    pReprNew = Vec_PtrEntry( p->vClassNew, 0 );
+    pReprNew = (Aig_Obj_t *)Vec_PtrEntry( p->vClassNew, 0 );
     assert( Vec_PtrSize(p->vClassOld) > 0 );
     assert( Vec_PtrSize(p->vClassNew) > 0 );
 
     // create old class
     pClassOld = Dch_ObjRemoveClass( p, pReprOld );
-    Vec_PtrForEachEntry( p->vClassOld, pObj, i )
+    Vec_PtrForEachEntry( Aig_Obj_t *, p->vClassOld, pObj, i )
     {
         pClassOld[i] = pObj;
         Aig_ObjSetRepr( p->pAig, pObj, i? pReprOld : NULL );
     }
     // create new class
     pClassNew = pClassOld + i;
-    Vec_PtrForEachEntry( p->vClassNew, pObj, i )
+    Vec_PtrForEachEntry( Aig_Obj_t *, p->vClassNew, pObj, i )
     {
         pClassNew[i] = pObj;
         Aig_ObjSetRepr( p->pAig, pObj, i? pReprNew : NULL );
@@ -572,21 +575,21 @@ int Dch_ClassesRefineConst1Group( Dch_Cla_t * p, Vec_Ptr_t * vRoots, int fRecurs
         return 0;
     // collect the nodes to be refined
     Vec_PtrClear( p->vClassNew );
-    Vec_PtrForEachEntry( vRoots, pObj, i )
+    Vec_PtrForEachEntry( Aig_Obj_t *, vRoots, pObj, i )
         if ( !p->pFuncNodeIsConst( p->pManData, pObj ) )
             Vec_PtrPush( p->vClassNew, pObj );
     // check if there is a new class
     if ( Vec_PtrSize(p->vClassNew) == 0 )
         return 0;
     p->nCands1 -= Vec_PtrSize(p->vClassNew);
-    pReprNew = Vec_PtrEntry( p->vClassNew, 0 );
+    pReprNew = (Aig_Obj_t *)Vec_PtrEntry( p->vClassNew, 0 );
     Aig_ObjSetRepr( p->pAig, pReprNew, NULL );
     if ( Vec_PtrSize(p->vClassNew) == 1 )
         return 1;
     // create a new class composed of these nodes
     ppClassNew = p->pMemClassesFree;
     p->pMemClassesFree += Vec_PtrSize(p->vClassNew);
-    Vec_PtrForEachEntry( p->vClassNew, pObj, i )
+    Vec_PtrForEachEntry( Aig_Obj_t *, p->vClassNew, pObj, i )
     {
         ppClassNew[i] = pObj;
         Aig_ObjSetRepr( p->pAig, pObj, i? pReprNew : NULL );
@@ -604,3 +607,5 @@ int Dch_ClassesRefineConst1Group( Dch_Cla_t * p, Vec_Ptr_t * vRoots, int fRecurs
 ////////////////////////////////////////////////////////////////////////
 
 
+ABC_NAMESPACE_IMPL_END
+