diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-10-03 22:07:36 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-10-03 22:07:36 -0700 |
| commit | 0175e1a9fe09bc9e053fae423dd0f7ff54b809ae (patch) | |
| tree | 89b5aea13084d431dc15fd40ff8316070862e9d6 /src/bool | |
| parent | a47e3b6f58c11797418a0aaf5deeebcf0456e20c (diff) | |
| download | abc-0175e1a9fe09bc9e053fae423dd0f7ff54b809ae.tar.gz abc-0175e1a9fe09bc9e053fae423dd0f7ff54b809ae.tar.bz2 abc-0175e1a9fe09bc9e053fae423dd0f7ff54b809ae.zip | |
C++ portability changes.
Diffstat (limited to 'src/bool')
| -rw-r--r-- | src/bool/lucky/lucky.c | 2 | ||||
| -rw-r--r-- | src/bool/lucky/luckyInt.h | 42 | ||||
| -rw-r--r-- | src/bool/lucky/luckySwap.c | 2 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/bool/lucky/lucky.c b/src/bool/lucky/lucky.c index bc51b751..cd480176 100644 --- a/src/bool/lucky/lucky.c +++ b/src/bool/lucky/lucky.c @@ -19,7 +19,7 @@ ABC_NAMESPACE_IMPL_START -inline int memCompare(word* x, word* y, int nVars) +int memCompare(word* x, word* y, int nVars) { int i; for(i=Kit_TruthWordNum_64bit( nVars )-1;i>=0;i--) diff --git a/src/bool/lucky/luckyInt.h b/src/bool/lucky/luckyInt.h index caf679cd..58a7235c 100644 --- a/src/bool/lucky/luckyInt.h +++ b/src/bool/lucky/luckyInt.h @@ -105,30 +105,30 @@ static inline int CompareWords( word x, word y) return 0; } -static inline int luckyMin( int x, int y ) { return (x < y) ? x : y; } -static inline int luckyMax( int x, int y ) { return (x < y) ? y : x; } +static inline int luckyMin( int x, int y ) { return (x < y) ? x : y; } +static inline int luckyMax( int x, int y ) { return (x < y) ? y : x; } -extern inline int memCompare(word* x, word* y, int nVars); -extern inline int Kit_TruthWordNum_64bit( int nVars ); +extern int memCompare(word* x, word* y, int nVars); +extern int Kit_TruthWordNum_64bit( int nVars ); extern Abc_TtStore_t * setTtStore(char * pFileInput); -extern inline void Abc_TruthStoreFree( Abc_TtStore_t * p ); -extern inline void Kit_TruthChangePhase_64bit( word * pInOut, int nVars, int iVar ); -extern inline void Kit_TruthNot_64bit(word * pIn, int nVars ); -extern inline void Kit_TruthCopy_64bit( word * pOut, word * pIn, int nVars ); -extern inline void Kit_TruthSwapAdjacentVars_64bit( word * pInOut, int nVars, int iVar ); -extern inline int Kit_TruthCountOnes_64bit( word* pIn, int nVars ); -extern void simpleMinimal(word* x, word* pAux,word* minimal, permInfo* pi, int nVars); -extern permInfo* setPermInfoPtr(int var); -extern void freePermInfoPtr(permInfo* x); -extern inline void Kit_TruthSemiCanonicize_Yasha_simple( word* pInOut, int nVars, int * pStore ); -extern inline unsigned Kit_TruthSemiCanonicize_Yasha( word* pInOut, int nVars, char * pCanonPerm); -extern inline unsigned Kit_TruthSemiCanonicize_Yasha1( word* pInOut, int nVars, char * pCanonPerm, int * pStore); -extern inline word luckyCanonicizer_final_fast_6Vars(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase); -extern inline word luckyCanonicizer_final_fast_6Vars1(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase); -extern inline unsigned adjustInfoAfterSwap(char* pCanonPerm, unsigned uCanonPhase, int iVar, unsigned info); -extern void resetPCanonPermArray_6Vars(char* x); -extern void swap_ij( word* f,int totalVars, int varI, int varJ); +extern void Abc_TruthStoreFree( Abc_TtStore_t * p ); +extern void Kit_TruthChangePhase_64bit( word * pInOut, int nVars, int iVar ); +extern void Kit_TruthNot_64bit(word * pIn, int nVars ); +extern void Kit_TruthCopy_64bit( word * pOut, word * pIn, int nVars ); +extern void Kit_TruthSwapAdjacentVars_64bit( word * pInOut, int nVars, int iVar ); +extern int Kit_TruthCountOnes_64bit( word* pIn, int nVars ); +extern void simpleMinimal(word* x, word* pAux,word* minimal, permInfo* pi, int nVars); +extern permInfo * setPermInfoPtr(int var); +extern void freePermInfoPtr(permInfo* x); +extern void Kit_TruthSemiCanonicize_Yasha_simple( word* pInOut, int nVars, int * pStore ); +extern unsigned Kit_TruthSemiCanonicize_Yasha( word* pInOut, int nVars, char * pCanonPerm); +extern unsigned Kit_TruthSemiCanonicize_Yasha1( word* pInOut, int nVars, char * pCanonPerm, int * pStore); +extern word luckyCanonicizer_final_fast_6Vars(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase); +extern word luckyCanonicizer_final_fast_6Vars1(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase); +extern unsigned adjustInfoAfterSwap(char* pCanonPerm, unsigned uCanonPhase, int iVar, unsigned info); +extern void resetPCanonPermArray_6Vars(char* x); +extern void swap_ij( word* f,int totalVars, int varI, int varJ); ABC_NAMESPACE_HEADER_END diff --git a/src/bool/lucky/luckySwap.c b/src/bool/lucky/luckySwap.c index e4065db6..65e6e545 100644 --- a/src/bool/lucky/luckySwap.c +++ b/src/bool/lucky/luckySwap.c @@ -33,7 +33,7 @@ static word mask[6][2] = { }; */ -inline int Kit_TruthWordNum_64bit( int nVars ) { return nVars <= 6 ? 1 : (1 << (nVars - 6));} +int Kit_TruthWordNum_64bit( int nVars ) { return nVars <= 6 ? 1 : (1 << (nVars - 6));} inline int Kit_WordCountOnes_64bit(word x) { |