diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-10-03 22:03:16 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-10-03 22:03:16 -0700 |
commit | a47e3b6f58c11797418a0aaf5deeebcf0456e20c (patch) | |
tree | 64f0017e5953f9d5a5a5486cbae0af38e56ece7b | |
parent | c7eab028a1cd70dcd6d4f8314c47da58207bf100 (diff) | |
download | abc-a47e3b6f58c11797418a0aaf5deeebcf0456e20c.tar.gz abc-a47e3b6f58c11797418a0aaf5deeebcf0456e20c.tar.bz2 abc-a47e3b6f58c11797418a0aaf5deeebcf0456e20c.zip |
C++ portability changes.
-rw-r--r-- | src/bool/lucky/luckyFast6.c | 6 | ||||
-rw-r--r-- | src/bool/lucky/luckyInt.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/bool/lucky/luckyFast6.c b/src/bool/lucky/luckyFast6.c index bfc555aa..c5b18b93 100644 --- a/src/bool/lucky/luckyFast6.c +++ b/src/bool/lucky/luckyFast6.c @@ -18,7 +18,7 @@ ABC_NAMESPACE_IMPL_START -inline void resetPCanonPermArray_6Vars(char* x) +void resetPCanonPermArray_6Vars(char* x) { x[0]='a'; x[1]='b'; @@ -27,7 +27,7 @@ inline void resetPCanonPermArray_6Vars(char* x) x[4]='e'; x[5]='f'; } -inline void resetPCanonPermArray(char* x, int nVars) +void resetPCanonPermArray(char* x, int nVars) { int i; for(i=0;i<nVars;i++) @@ -36,7 +36,7 @@ inline void resetPCanonPermArray(char* x, int nVars) -inline word Abc_allFlip(word x, unsigned* pCanonPhase) + word Abc_allFlip(word x, unsigned* pCanonPhase) { if( (x>>63) ) { diff --git a/src/bool/lucky/luckyInt.h b/src/bool/lucky/luckyInt.h index f236693c..caf679cd 100644 --- a/src/bool/lucky/luckyInt.h +++ b/src/bool/lucky/luckyInt.h @@ -126,10 +126,9 @@ extern inline unsigned Kit_TruthSemiCanonicize_Yasha( word* pInOut, int nVars, 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 void resetPCanonPermArray_6Vars(char* x); -extern void swap_ij( word* f,int totalVars, int varI, int varJ); extern inline unsigned adjustInfoAfterSwap(char* pCanonPerm, unsigned uCanonPhase, int iVar, unsigned info); -extern inline void resetPCanonPermArray(char* x, int nVars); +extern void resetPCanonPermArray_6Vars(char* x); +extern void swap_ij( word* f,int totalVars, int varI, int varJ); ABC_NAMESPACE_HEADER_END |