3 files changed, 27 insertions, 13 deletions
diff --git a/src/bdd/cas/cas.h b/src/bdd/cas/cas.h
index 68a5c3a0..33958325 100644
--- a/src/bdd/cas/cas.h
+++ b/src/bdd/cas/cas.h
@@ -21,6 +21,7 @@
 #ifndef __CAS_H__
 #define __CAS_H__
 
+
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
@@ -29,9 +30,10 @@
 ///                         PARAMETERS                               ///
 ////////////////////////////////////////////////////////////////////////
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+
+
+ABC_NAMESPACE_HEADER_START
+
 
 #define MAXINPUTS   1024
 #define MAXOUTPUTS  1024
@@ -50,9 +52,11 @@ extern "C" {
 
 /*=== zzz.c ==========================================================*/
  
-#ifdef __cplusplus
-}
-#endif
+
+
+ABC_NAMESPACE_HEADER_END
+
+
 
 #endif
 
diff --git a/src/bdd/cas/casCore.c b/src/bdd/cas/casCore.c
index 4010235c..5511b8e7 100644
--- a/src/bdd/cas/casCore.c
+++ b/src/bdd/cas/casCore.c
@@ -23,9 +23,14 @@
 #include <string.h>
 #include <time.h>
 
+#include "main.h"
+#include "cmd.h"
 #include "extra.h"
 #include "cas.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 ////////////////////////////////////////////////////////////////////////
 ///                      static functions                            ///
 ////////////////////////////////////////////////////////////////////////
@@ -254,8 +259,6 @@ int Abc_CascadeExperiment( char * pFileGeneric, DdManager * dd, DdNode ** pOutpu
     // verify the results
     if ( fCheck )
     {
-        extern int Cmd_CommandExecute( void * pAbc, char * sCommand );
-        extern void * Abc_FrameGetGlobalFrame();
         char Command[200];
         sprintf( Command, "cec %s %s", FileNameIni, FileNameFin );
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
@@ -845,7 +848,7 @@ void WriteDDintoBLIFfile( FILE * pFile, DdNode * Func, char * OutputName, char *
     refAddr = ( long )Cudd_Regular(Func);
     diff = 0;
     gen = st_init_gen( visited );
-    while ( st_gen( gen, ( char ** ) &Node, NULL ) )
+    while ( st_gen( gen, ( const char ** ) &Node, NULL ) )
     {
         diff |= refAddr ^ ( long ) Node;
     }
@@ -867,7 +870,7 @@ void WriteDDintoBLIFfile( FILE * pFile, DdNode * Func, char * OutputName, char *
 
 
     gen = st_init_gen( visited );
-    while ( st_gen( gen, ( char ** ) &Node, NULL ) )
+    while ( st_gen( gen, ( const char ** ) &Node, NULL ) )
     {
         if ( Node->index == CUDD_MAXINDEX )
         {
@@ -990,7 +993,7 @@ void WriteDDintoBLIFfileReorder( DdManager * dd, FILE * pFile, DdNode * Func, ch
     refAddr = ( long )Cudd_Regular(bFmin);
     diff = 0;
     gen = st_init_gen( visited );
-    while ( st_gen( gen, ( char ** ) &Node, NULL ) )
+    while ( st_gen( gen, ( const char ** ) &Node, NULL ) )
     {
         diff |= refAddr ^ ( long ) Node;
     }
@@ -1012,7 +1015,7 @@ void WriteDDintoBLIFfileReorder( DdManager * dd, FILE * pFile, DdNode * Func, ch
 
 
     gen = st_init_gen( visited );
-    while ( st_gen( gen, ( char ** ) &Node, NULL ) )
+    while ( st_gen( gen, ( const char ** ) &Node, NULL ) )
     {
         if ( Node->index == CUDD_MAXINDEX )
         {
@@ -1143,7 +1146,7 @@ cuddBddTransferPermute( DdManager * ddS, DdManager * ddD, DdNode * f, int * Perm
     gen = st_init_gen( table );
     if ( gen == NULL )
         goto failure;
-    while ( st_gen( gen, ( char ** ) &key, ( char ** ) &value ) )
+    while ( st_gen( gen, ( const char ** ) &key, ( char ** ) &value ) )
     {
         Cudd_RecursiveDeref( ddD, value );
     }
@@ -1259,3 +1262,5 @@ cuddBddTransferPermuteRecur( DdManager * ddS,
 
 
 
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/cas/casDec.c b/src/bdd/cas/casDec.c
index 25309d32..111f559e 100644
--- a/src/bdd/cas/casDec.c
+++ b/src/bdd/cas/casDec.c
@@ -26,6 +26,9 @@
 #include "extra.h"
 #include "cas.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 ////////////////////////////////////////////////////////////////////////
 ///                      type definitions                            ///
 ////////////////////////////////////////////////////////////////////////
@@ -506,3 +509,5 @@ void WriteLUTSintoBLIFfile( FILE * pFile, DdManager * dd, LUT ** pLuts, int nLut
 
 
 
+ABC_NAMESPACE_IMPL_END
+