diff options
| author | Baruch Sterin <baruchs@gmail.com> | 2015-11-05 01:23:31 -0800 |
|---|---|---|
| committer | Baruch Sterin <baruchs@gmail.com> | 2015-11-05 01:23:31 -0800 |
| commit | c0ba25a69388765d7057ae8729e12b8a85435e35 (patch) | |
| tree | 98c999fed9d9cf65b6425334e819c8b339fc6025 /src/base/cba/cbaNtk.c | |
| parent | 8ee49ff150a12f7183fe25e0a8d8e845391c100b (diff) | |
| download | abc-c0ba25a69388765d7057ae8729e12b8a85435e35.tar.gz abc-c0ba25a69388765d7057ae8729e12b8a85435e35.tar.bz2 abc-c0ba25a69388765d7057ae8729e12b8a85435e35.zip | |
silence clang errors when compiling as C++
Diffstat (limited to 'src/base/cba/cbaNtk.c')
| -rw-r--r-- | src/base/cba/cbaNtk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/base/cba/cbaNtk.c b/src/base/cba/cbaNtk.c index d3ed96f5..fee91192 100644 --- a/src/base/cba/cbaNtk.c +++ b/src/base/cba/cbaNtk.c @@ -90,7 +90,8 @@ void Cba_NtkPrintDistrib( Cba_Ntk_t * p, int fVerbose ) Vec_Ptr_t * vTypes, * vOccurs; Vec_Int_t * vAnds = Vec_IntStart( CBA_BOX_LAST ); int iRnObj = -1, nCountRange = 0; - int i, k, s, s0, s1, Type; word Sign; + int i, k, s, s0, s1; word Sign; + Cba_ObjType_t Type; char * pTypeNames[CBA_BOX_LAST]; Cba_ManCreatePrimMap( pTypeNames ); // allocate statistics arrays @@ -1060,7 +1061,7 @@ Cba_Man_t * Cba_ManDeriveFromGia( Gia_Man_t * pGia, int fUseXor ) Cba_NtkCleanObjNames( pNtk ); Gia_ManForEachCiId( pGia, iObj, i ) { - NameId = pGia->vNamesIn? Abc_NamStrFindOrAdd(p->pStrs, Vec_PtrEntry(pGia->vNamesIn, i), NULL) : Cba_NtkNewStrId(pNtk, "i%d", i); + NameId = pGia->vNamesIn? Abc_NamStrFindOrAdd(p->pStrs, (char*)Vec_PtrEntry(pGia->vNamesIn, i), NULL) : Cba_NtkNewStrId(pNtk, "i%d", i); iObjNew = Cba_ObjAlloc( pNtk, CBA_OBJ_PI, 0, 1 ); Cba_ObjSetName( pNtk, iObjNew, NameId ); Vec_IntWriteEntry( vLit2Fon, Abc_Var2Lit(iObj, 0), Cba_ObjFon0(pNtk, iObjNew) ); @@ -1082,7 +1083,7 @@ Cba_Man_t * Cba_ManDeriveFromGia( Gia_Man_t * pGia, int fUseXor ) iObjNew = Cba_ObjAlloc( pNtk, CBA_BOX_BUF, 1, 1 ); Cba_ObjSetFinFon( pNtk, iObjNew, 0, iFon0 ); iFon0 = Cba_ObjFon0(pNtk, iObjNew); // non-const fon unique for this output - NameId = pGia->vNamesOut? Abc_NamStrFindOrAdd(p->pStrs, Vec_PtrEntry(pGia->vNamesOut, i), NULL) : Cba_NtkNewStrId(pNtk, "o%d", i); + NameId = pGia->vNamesOut? Abc_NamStrFindOrAdd(p->pStrs, (char*)Vec_PtrEntry(pGia->vNamesOut, i), NULL) : Cba_NtkNewStrId(pNtk, "o%d", i); iObjNew = Cba_ObjAlloc( pNtk, CBA_OBJ_PO, 1, 0 ); Cba_ObjSetName( pNtk, iObjNew, NameId ); Cba_ObjSetFinFon( pNtk, iObjNew, 0, iFon0 ); |