diff options
| author | Mathias Soeken <mathias.soeken@gmail.com> | 2016-08-24 09:28:21 +0200 |
|---|---|---|
| committer | Mathias Soeken <mathias.soeken@gmail.com> | 2016-08-24 09:28:21 +0200 |
| commit | db1daf7b8ac533c9b3f08adaf2507726b7601680 (patch) | |
| tree | d94bb5b183391d8f96455c05933ebf0e0613b59f /src/base/abci | |
| parent | 30b3a7ab91e11ab74e308a982f206f88b5d36541 (diff) | |
| parent | 9ac7b05e2ae28f8868b06ce4f99c441d3d0ca268 (diff) | |
| download | abc-db1daf7b8ac533c9b3f08adaf2507726b7601680.tar.gz abc-db1daf7b8ac533c9b3f08adaf2507726b7601680.tar.bz2 abc-db1daf7b8ac533c9b3f08adaf2507726b7601680.zip | |
Merged alanmi/abc into default
Diffstat (limited to 'src/base/abci')
| -rw-r--r-- | src/base/abci/abcCollapse.c | 2 | ||||
| -rw-r--r-- | src/base/abci/abcExact.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/base/abci/abcCollapse.c b/src/base/abci/abcCollapse.c index 25d78b04..8c2b3b39 100644 --- a/src/base/abci/abcCollapse.c +++ b/src/base/abci/abcCollapse.c @@ -922,7 +922,7 @@ Abc_Ntk_t * Abc_NtkFromSopsInt( Abc_Ntk_t * pNtk, int nCubeLim, int nBTLimit, in vSupp = Vec_WecEntry( vSupps, i ); Vec_IntForEachEntry( vSupp, iCi, k ) Abc_ObjAddFanin( pNodeNew, Abc_NtkCi(pNtkNew, iCi) ); - pNodeNew->pData = Abc_SopRegister( (Mem_Flex_t *)pNtkNew->pManFunc, Vec_PtrEntry( vSops, i ) ); + pNodeNew->pData = Abc_SopRegister( (Mem_Flex_t *)pNtkNew->pManFunc, (const char*)Vec_PtrEntry( vSops, i ) ); assert( pNodeNew->pData != (void *)(ABC_PTRINT_T)1 ); Abc_ObjAddFanin( pNode->pCopy, pNodeNew ); } diff --git a/src/base/abci/abcExact.c b/src/base/abci/abcExact.c index d003b879..2d386157 100644 --- a/src/base/abci/abcExact.c +++ b/src/base/abci/abcExact.c @@ -1266,7 +1266,7 @@ static Gia_Man_t * Ses_ManExtractGia( char const * pSol ) { nObj = Gia_ManAppendCi( pGia ); Vec_IntPush( pGates, nObj ); - Vec_PtrSetEntry( pGia->vNamesIn, i, Extra_UtilStrsav( Vec_PtrEntry( vNames, i ) ) ); + Vec_PtrSetEntry( pGia->vNamesIn, i, Extra_UtilStrsav( (const char*)Vec_PtrEntry( vNames, i ) ) ); } /* gates */ @@ -1308,7 +1308,7 @@ static Gia_Man_t * Ses_ManExtractGia( char const * pSol ) if ( Abc_LitIsCompl( *p ) ) nObj = Abc_LitNot( nObj ); Gia_ManAppendCo( pGia, nObj ); - Vec_PtrSetEntry( pGia->vNamesOut, h, Extra_UtilStrsav( Vec_PtrEntry( vNames, pSol[ABC_EXACT_SOL_NVARS] + h ) ) ); + Vec_PtrSetEntry( pGia->vNamesOut, h, Extra_UtilStrsav( (const char*)Vec_PtrEntry( vNames, pSol[ABC_EXACT_SOL_NVARS] + h ) ) ); p += ( 2 + pSol[ABC_EXACT_SOL_NVARS] ); } Abc_NodeFreeNames( vNames ); |