Fixing C++ compilation issues.

7 files changed, 13 insertions, 11 deletions

diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h
index 7f21499b..b0e2426b 100644
--- a/src/aig/gia/gia.h
+++ b/src/aig/gia/gia.h
@@ -1028,8 +1028,6 @@ extern void                Tas_ManSatPrintStats( Tas_Man_t * p );
 extern int                 Tas_ManSolve( Tas_Man_t * p, Gia_Obj_t * pObj, Gia_Obj_t * pObj2 );
 extern int                 Tas_ManSolveArray( Tas_Man_t * p, Vec_Ptr_t * vObjs );
 
-extern int                 Gia_ManToBridgeAbsNetlist( FILE * pFile, Gia_Man_t * p );
-
 
 ABC_NAMESPACE_HEADER_END
 
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 8ddb3bfe..0be55670 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -11678,8 +11678,8 @@ usage:
 ***********************************************************************/
 int Abc_CommandSendAig( Abc_Frame_t * pAbc, int argc, char ** argv )
 {
-    const int BRIDGE_NETLIST = 106;
-    const int BRIDGE_ABS_NETLIST = 107;
+//    const int BRIDGE_NETLIST = 106;
+//    const int BRIDGE_ABS_NETLIST = 107;
 
     int c, fAndSpace = 1, fAbsNetlist = 0;
     Extra_UtilGetoptReset();
diff --git a/src/misc/util/abc_global.h b/src/misc/util/abc_global.h
index 7535014b..21546842 100644
--- a/src/misc/util/abc_global.h
+++ b/src/misc/util/abc_global.h
@@ -268,10 +268,14 @@ enum Abc_VerbLevel
     ABC_VERBOSE  =  2
 };
 
+#define BRIDGE_NETLIST           106
+#define BRIDGE_ABS_NETLIST       107
+
 // string printing
 extern char * vnsprintf(const char* format, va_list args);
 extern char * nsprintf(const char* format, ...);
 extern int Gia_ManToBridgeText( FILE * pFile, int Size, unsigned char * pBuffer );
+extern int Gia_ManToBridgeAbsNetlist( FILE * pFile, void * p, int pkg_type );
 
 // misc printing procedures
 static inline void Abc_Print( int level, const char * format, ... )
diff --git a/src/misc/util/utilBridge.c b/src/misc/util/utilBridge.c
index 493047f7..3ac7ba2c 100644
--- a/src/misc/util/utilBridge.c
+++ b/src/misc/util/utilBridge.c
@@ -33,8 +33,8 @@ ABC_NAMESPACE_IMPL_START
 
 #define BRIDGE_TEXT_MESSAGE   999996
 #define BRIDGE_RESULTS           101
-#define BRIDGE_NETLIST           106
-#define BRIDGE_ABS_NETLIST       107
+//#define BRIDGE_NETLIST           106
+//#define BRIDGE_ABS_NETLIST       107
 #define BRIDGE_BAD_ABS           105
 
 #define BRIDGE_VALUE_X             0
@@ -146,10 +146,10 @@ int Gia_ManToBridgeText( FILE * pFile, int Size, unsigned char * pBuffer )
     Gia_CreateHeader( pFile, BRIDGE_TEXT_MESSAGE, Size, pBuffer );
     return 1;
 }
-int Gia_ManToBridgeAbsNetlist( FILE * pFile, Gia_Man_t * p, int pkg_type )
+int Gia_ManToBridgeAbsNetlist( FILE * pFile, void * p, int pkg_type )
 {
     Vec_Str_t * vBuffer;
-    vBuffer = Gia_ManToBridgeVec( p );
+    vBuffer = Gia_ManToBridgeVec( (Gia_Man_t *)p );
     Gia_CreateHeader( pFile, pkg_type, Vec_StrSize(vBuffer), (unsigned char *)Vec_StrArray(vBuffer) );
     Vec_StrFree( vBuffer );
     return 1;
diff --git a/src/proof/abs/absGla.c b/src/proof/abs/absGla.c
index 5002a049..e05959a2 100644
--- a/src/proof/abs/absGla.c
+++ b/src/proof/abs/absGla.c
@@ -1495,7 +1495,7 @@ void Gia_Ga2SendAbsracted( Ga2_Man_t * p, int fVerbose )
     Vec_IntFreeP( &vGateClasses );
     Gia_ManCleanValue( p->pGia );
     // send it out
-    Gia_ManToBridgeAbsNetlist( stdout, pAbs );
+    Gia_ManToBridgeAbsNetlist( stdout, pAbs, BRIDGE_ABS_NETLIST );
     Gia_ManStop( pAbs );
 }
 void Gia_Ga2SendCancel( Ga2_Man_t * p, int fVerbose )
diff --git a/src/proof/abs/absGlaOld.c b/src/proof/abs/absGlaOld.c
index e7a445a2..e2f83e96 100644
--- a/src/proof/abs/absGlaOld.c
+++ b/src/proof/abs/absGlaOld.c
@@ -1583,7 +1583,7 @@ void Gia_GlaSendAbsracted( Gla_Man_t * p, int fVerbose )
     pAbs = Gia_ManDupAbsGates( p->pGia0, vGateClasses );
     Vec_IntFreeP( &vGateClasses );
     // send it out
-    Gia_ManToBridgeAbsNetlist( stdout, pAbs );
+    Gia_ManToBridgeAbsNetlist( stdout, pAbs, BRIDGE_ABS_NETLIST );
     Gia_ManStop( pAbs );
 }
 void Gia_GlaSendCancel( Gla_Man_t * p, int fVerbose )
diff --git a/src/proof/abs/absVta.c b/src/proof/abs/absVta.c
index d6d0be60..4b943870 100644
--- a/src/proof/abs/absVta.c
+++ b/src/proof/abs/absVta.c
@@ -1398,7 +1398,7 @@ void Gia_VtaSendAbsracted( Vta_Man_t * p, int fVerbose )
     pAbs = Gia_ManDupAbsGates( p->pGia, p->pGia->vGateClasses );
     Vec_IntFreeP( &p->pGia->vGateClasses );
     // send it out
-    Gia_ManToBridgeAbsNetlist( stdout, pAbs );
+    Gia_ManToBridgeAbsNetlist( stdout, pAbs, BRIDGE_ABS_NETLIST );
     Gia_ManStop( pAbs );
 }
 void Gia_VtaSendCancel( Vta_Man_t * p, int fVerbose )