diff options
| author | Baruch Sterin <baruchs@gmail.com> | 2015-10-16 14:02:30 -0700 |
|---|---|---|
| committer | Baruch Sterin <baruchs@gmail.com> | 2015-10-16 14:02:30 -0700 |
| commit | 8810ef12da3f56523a95863d6583f09531dfe8de (patch) | |
| tree | 934ad43bcf6a8fac9f1effeee34963f443896056 /src | |
| parent | 8268553369175ea767e05fc02ecc75f7065d7b87 (diff) | |
| download | abc-8810ef12da3f56523a95863d6583f09531dfe8de.tar.gz abc-8810ef12da3f56523a95863d6583f09531dfe8de.tar.bz2 abc-8810ef12da3f56523a95863d6583f09531dfe8de.zip | |
Fix C++ compilation errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/aig/miniaig/miniaig.h | 4 | ||||
| -rw-r--r-- | src/base/bac/bacNtk.c | 11 | ||||
| -rw-r--r-- | src/base/wlc/wlcReadSmt.c | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/aig/miniaig/miniaig.h b/src/aig/miniaig/miniaig.h index 4c8a9203..dadb578b 100644 --- a/src/aig/miniaig/miniaig.h +++ b/src/aig/miniaig/miniaig.h @@ -30,6 +30,8 @@ #include <string.h> #include <assert.h> +ABC_NAMESPACE_HEADER_START + //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// //////////////////////////////////////////////////////////////////////// @@ -268,6 +270,8 @@ static int Mini_AigCheck( Mini_Aig_t * p ) /// FUNCTION DECLARATIONS /// //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_HEADER_END + #endif //////////////////////////////////////////////////////////////////////// diff --git a/src/base/bac/bacNtk.c b/src/base/bac/bacNtk.c index 4d2cd665..cd08b0b6 100644 --- a/src/base/bac/bacNtk.c +++ b/src/base/bac/bacNtk.c @@ -130,10 +130,10 @@ static inline int Bac_GetTypeId( Bac_ObjType_t Type ) } void Bac_ManSetupTypes( char ** pNames, char ** pSymbs ) { - Bac_ObjType_t Type; + int Type; for ( Type = 1; Type < BAC_BOX_UNKNOWN; Type++ ) { - int Id = Bac_GetTypeId( Type ); + int Id = Bac_GetTypeId( (Bac_ObjType_t)Type ); pNames[Type] = s_Types[Id].pName; pSymbs[Type] = s_Types[Id].pSymb; } @@ -160,14 +160,14 @@ char * Bac_NtkGenerateName( Bac_Ntk_t * p, Bac_ObjType_t Type, Vec_Int_t * vBits Bac_ObjType_t Bac_NameToType( char * pName ) { - Bac_ObjType_t i; + int i; if ( strncmp(pName, s_Pref, strlen(s_Pref)) ) - return 0; + return BAC_OBJ_NONE; pName += strlen(s_Pref); for ( i = 1; i < BAC_BOX_UNKNOWN; i++ ) if ( !strncmp(pName, s_Types[i].pName, strlen(s_Types[i].pName)) ) return s_Types[i].Type; - return 0; + return BAC_OBJ_NONE; } Vec_Int_t * Bac_NameToRanges( char * pName ) { @@ -601,4 +601,3 @@ Bac_Man_t * Bac_ManCollapse( Bac_Man_t * p ) ABC_NAMESPACE_IMPL_END - diff --git a/src/base/wlc/wlcReadSmt.c b/src/base/wlc/wlcReadSmt.c index e7ee4d16..2c158a48 100644 --- a/src/base/wlc/wlcReadSmt.c +++ b/src/base/wlc/wlcReadSmt.c @@ -91,9 +91,9 @@ static inline char * Smt_GetTypeName( Smt_LineType_t Type ) } static inline void Smt_AddTypes( Abc_Nam_t * p ) { - Smt_LineType_t Type; + int Type; for ( Type = 1; Type < SMT_PRS_END; Type++ ) - Abc_NamStrFindOrAdd( p, Smt_GetTypeName(Type), NULL ); + Abc_NamStrFindOrAdd( p, Smt_GetTypeName((Smt_LineType_t)Type), NULL ); assert( Abc_NamObjNumMax(p) == SMT_PRS_END ); } @@ -911,4 +911,3 @@ Wlc_Ntk_t * Wlc_ReadSmt( char * pFileName ) ABC_NAMESPACE_IMPL_END - |