From 55594441265e413a1535ab7e29d4961179d0d5d9 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Wed, 3 Oct 2012 22:11:55 -0700 Subject: C++ portability changes. --- src/bool/lucky/luckyFast6.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bool/lucky/luckyFast6.c b/src/bool/lucky/luckyFast6.c index c5b18b93..3105e2e8 100644 --- a/src/bool/lucky/luckyFast6.c +++ b/src/bool/lucky/luckyFast6.c @@ -48,7 +48,7 @@ void resetPCanonPermArray(char* x, int nVars) } -inline unsigned adjustInfoAfterSwap(char* pCanonPerm, unsigned uCanonPhase, int iVar, unsigned info) +unsigned adjustInfoAfterSwap(char* pCanonPerm, unsigned uCanonPhase, int iVar, unsigned info) { if(info<4) return (uCanonPhase ^= (info << iVar)); @@ -262,12 +262,12 @@ inline word Extra_Truth6MinimumRoundMany1( word t, int* pStore, char* pCanonPerm return Extra_Truth6MinimumRoundMany( t, pStore, pCanonPerm, pCanonPhase); } -inline word luckyCanonicizer_final_fast_6Vars(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase) +word luckyCanonicizer_final_fast_6Vars(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase) { (* pCanonPhase) = Kit_TruthSemiCanonicize_Yasha1( &InOut, 6, pCanonPerm, pStore); return Extra_Truth6MinimumRoundMany1(InOut, pStore, pCanonPerm, pCanonPhase); } -inline word luckyCanonicizer_final_fast_6Vars1(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase ) +word luckyCanonicizer_final_fast_6Vars1(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase ) { (* pCanonPhase) = Kit_TruthSemiCanonicize_Yasha1( &InOut, 6, pCanonPerm, pStore); InOut = Extra_Truth6MinimumRoundMany1(InOut, pStore, pCanonPerm, pCanonPhase); -- cgit v1.2.3