Commit 55594441 by Alan Mishchenko

C++ portability changes.

parent c890440f
...@@ -48,7 +48,7 @@ void resetPCanonPermArray(char* x, int nVars) ...@@ -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) if(info<4)
return (uCanonPhase ^= (info << iVar)); return (uCanonPhase ^= (info << iVar));
...@@ -262,12 +262,12 @@ inline word Extra_Truth6MinimumRoundMany1( word t, int* pStore, char* pCanonPerm ...@@ -262,12 +262,12 @@ inline word Extra_Truth6MinimumRoundMany1( word t, int* pStore, char* pCanonPerm
return Extra_Truth6MinimumRoundMany( t, pStore, pCanonPerm, pCanonPhase); 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); (* pCanonPhase) = Kit_TruthSemiCanonicize_Yasha1( &InOut, 6, pCanonPerm, pStore);
return Extra_Truth6MinimumRoundMany1(InOut, pStore, pCanonPerm, pCanonPhase); 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); (* pCanonPhase) = Kit_TruthSemiCanonicize_Yasha1( &InOut, 6, pCanonPerm, pStore);
InOut = Extra_Truth6MinimumRoundMany1(InOut, pStore, pCanonPerm, pCanonPhase); InOut = Extra_Truth6MinimumRoundMany1(InOut, pStore, pCanonPerm, pCanonPhase);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment