diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-12-13 12:17:03 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-12-13 12:17:03 -0800 |
| commit | 8fdc5d220f81902e95a554c770edc22863d48653 (patch) | |
| tree | 1c59683566daf487d0d24f6986ee66752944c6cd | |
| parent | 23af7f903603b6bbeb94b0128938361ed9955dd9 (diff) | |
| download | abc-8fdc5d220f81902e95a554c770edc22863d48653.tar.gz abc-8fdc5d220f81902e95a554c770edc22863d48653.tar.bz2 abc-8fdc5d220f81902e95a554c770edc22863d48653.zip | |
g++ portability changes.
| -rw-r--r-- | src/aig/cnf/cnfMan.c | 3 | ||||
| -rw-r--r-- | src/aig/saig/saigGlaPba2.c | 2 | ||||
| -rw-r--r-- | src/base/abci/abcRec.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/aig/cnf/cnfMan.c b/src/aig/cnf/cnfMan.c index 07c52b05..6b107651 100644 --- a/src/aig/cnf/cnfMan.c +++ b/src/aig/cnf/cnfMan.c @@ -334,8 +334,9 @@ void Cnf_DataWriteIntoFile( Cnf_Dat_t * p, char * pFileName, int fReadable ) 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; assert( nFrames > 0 ); assert( pSat ); diff --git a/src/aig/saig/saigGlaPba2.c b/src/aig/saig/saigGlaPba2.c index 8de5fb32..1daea5d9 100644 --- a/src/aig/saig/saigGlaPba2.c +++ b/src/aig/saig/saigGlaPba2.c @@ -419,7 +419,7 @@ Vec_Int_t * Aig_Gla3ManUnsatCore( sat_solver2 * pSat, int nConfMax, int fVerbose // derive the UNSAT core clk = clock(); - vCore = Sat_ProofCore( pSat ); + vCore = (Vec_Int_t *)Sat_ProofCore( pSat ); if ( fVerbose ) { printf( "SAT core contains %8d clauses (out of %8d). ", Vec_IntSize(vCore), sat_solver2_nclauses(pSat) ); diff --git a/src/base/abci/abcRec.c b/src/base/abci/abcRec.c index 1b9700f1..d275f5b0 100644 --- a/src/base/abci/abcRec.c +++ b/src/base/abci/abcRec.c @@ -293,7 +293,7 @@ void Abc_NtkRecDumpTruthTables( Abc_ManRec_t * p ) for ( i = 0; i < p->nBins; i++ ) 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 ) continue; Extra_PrintHex( pFile, pTruth, nVars ); |