diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-10-03 21:49:18 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-10-03 21:49:18 -0700 |
| commit | 56d3d7cd22f761004139a0512681eac57e638cfc (patch) | |
| tree | 524b94bee7e1dfbdf14c8ff1dbba271a97abaf13 /src/aig | |
| parent | 63c95405439b464f6d801e68c15f767bc6336637 (diff) | |
| download | abc-56d3d7cd22f761004139a0512681eac57e638cfc.tar.gz abc-56d3d7cd22f761004139a0512681eac57e638cfc.tar.bz2 abc-56d3d7cd22f761004139a0512681eac57e638cfc.zip | |
C++ portability changes.
Diffstat (limited to 'src/aig')
| -rw-r--r-- | src/aig/gia/giaAiger.c | 4 | ||||
| -rw-r--r-- | src/aig/gia/giaDup.c | 2 | ||||
| -rw-r--r-- | src/aig/saig/saigConstr.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/aig/gia/giaAiger.c b/src/aig/gia/giaAiger.c index 086ab0a8..538b23e9 100644 --- a/src/aig/gia/giaAiger.c +++ b/src/aig/gia/giaAiger.c @@ -1063,7 +1063,7 @@ Gia_Man_t * Gia_ReadAigerFromMemory( char * pContents, int nFileSize, int fSkipS vFlopMap = pNew->vFlopClasses; pNew->vFlopClasses = NULL; vGateMap = pNew->vGateClasses; pNew->vGateClasses = NULL; vObjMap = pNew->vObjClasses; pNew->vObjClasses = NULL; - pManTime = pNew->pManTime; pNew->pManTime = NULL; + pManTime = (Tim_Man_t *)pNew->pManTime; pNew->pManTime = NULL; pNew = Gia_ManCleanup( pTemp = pNew ); if ( (vGateMap || vObjMap) && (Gia_ManObjNum(pNew) < Gia_ManObjNum(pTemp)) ) printf( "Cleanup removed objects after reading. Old gate/object abstraction maps are invalid!\n" ); @@ -1555,7 +1555,7 @@ void Gia_WriteAiger( Gia_Man_t * pInit, char * pFileName, int fWriteSymbols, int // write timing information if ( p->pManTime ) { - Vec_Str_t * vStr = Tim_ManSave( p->pManTime ); + Vec_Str_t * vStr = Tim_ManSave( (Tim_Man_t *)p->pManTime ); unsigned char Buffer[10]; int nSize = Vec_StrSize(vStr); Gia_WriteInt( Buffer, nSize ); diff --git a/src/aig/gia/giaDup.c b/src/aig/gia/giaDup.c index e49ce616..da0551fc 100644 --- a/src/aig/gia/giaDup.c +++ b/src/aig/gia/giaDup.c @@ -923,7 +923,7 @@ Gia_Man_t * Gia_ManDupNormalize( Gia_Man_t * p ) ***********************************************************************/ Gia_Man_t * Gia_ManDupUnnomalize( Gia_Man_t * p ) { - Tim_Man_t * pTime = p->pManTime; + Tim_Man_t * pTime = (Tim_Man_t *)p->pManTime; Gia_Man_t * pNew; Gia_Obj_t * pObj; int i, k, curCi, curCo, curNo, nodeLim; diff --git a/src/aig/saig/saigConstr.c b/src/aig/saig/saigConstr.c index 682c46cf..5f54ef83 100644 --- a/src/aig/saig/saigConstr.c +++ b/src/aig/saig/saigConstr.c @@ -292,8 +292,8 @@ Aig_Man_t * Saig_ManDupUnfoldConstrs( Aig_Man_t * pAig ) Vec_VecFree( (Vec_Vec_t *)vConsAll ); return Aig_ManDupDfs( pAig ); } - Vec_PtrSort( vOuts, Saig_ManDupCompare ); - Vec_PtrSort( vCons, Saig_ManDupCompare ); + Vec_PtrSort( vOuts, (int (*)(void))Saig_ManDupCompare ); + Vec_PtrSort( vCons, (int (*)(void))Saig_ManDupCompare ); Vec_PtrPush( vOutsAll, vOuts ); Vec_PtrPush( vConsAll, vCons ); } |