Commit 8fdc5d22 by Alan Mishchenko

g++ portability changes.

parent 23af7f90
...@@ -334,8 +334,9 @@ void Cnf_DataWriteIntoFile( Cnf_Dat_t * p, char * pFileName, int fReadable ) ...@@ -334,8 +334,9 @@ void Cnf_DataWriteIntoFile( Cnf_Dat_t * p, char * pFileName, int fReadable )
SeeAlso [] SeeAlso []
***********************************************************************/ ***********************************************************************/
void * Cnf_DataWriteIntoSolverInt( sat_solver * pSat, Cnf_Dat_t * p, int nFrames, int fInit ) void * Cnf_DataWriteIntoSolverInt( void * pSolver, Cnf_Dat_t * p, int nFrames, int fInit )
{ {
sat_solver * pSat = (sat_solver *)pSolver;
int i, f, status; int i, f, status;
assert( nFrames > 0 ); assert( nFrames > 0 );
assert( pSat ); assert( pSat );
......
...@@ -419,7 +419,7 @@ Vec_Int_t * Aig_Gla3ManUnsatCore( sat_solver2 * pSat, int nConfMax, int fVerbose ...@@ -419,7 +419,7 @@ Vec_Int_t * Aig_Gla3ManUnsatCore( sat_solver2 * pSat, int nConfMax, int fVerbose
// derive the UNSAT core // derive the UNSAT core
clk = clock(); clk = clock();
vCore = Sat_ProofCore( pSat ); vCore = (Vec_Int_t *)Sat_ProofCore( pSat );
if ( fVerbose ) if ( fVerbose )
{ {
printf( "SAT core contains %8d clauses (out of %8d). ", Vec_IntSize(vCore), sat_solver2_nclauses(pSat) ); printf( "SAT core contains %8d clauses (out of %8d). ", Vec_IntSize(vCore), sat_solver2_nclauses(pSat) );
......
...@@ -293,7 +293,7 @@ void Abc_NtkRecDumpTruthTables( Abc_ManRec_t * p ) ...@@ -293,7 +293,7 @@ void Abc_NtkRecDumpTruthTables( Abc_ManRec_t * p )
for ( i = 0; i < p->nBins; i++ ) for ( i = 0; i < p->nBins; i++ )
for ( pObj = p->pBins[i]; pObj; pObj = pObj->pCopy ) for ( pObj = p->pBins[i]; pObj; pObj = pObj->pCopy )
{ {
pTruth = Vec_PtrEntry(p->vTtNodes, pObj->Id); pTruth = (unsigned *)Vec_PtrEntry(p->vTtNodes, pObj->Id);
if ( (int)Kit_TruthSupport(pTruth, nVars) != (1<<nVars)-1 ) if ( (int)Kit_TruthSupport(pTruth, nVars) != (1<<nVars)-1 )
continue; continue;
Extra_PrintHex( pFile, pTruth, nVars ); Extra_PrintHex( pFile, pTruth, nVars );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment