Merged alanmi/abc into default

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 );
     }

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 );