mac compile fixes

ladnir · ladnir · commit 5ffb29791245 · 2025-02-26T11:43:15.000-08:00
diff --git a/cryptoTools b/cryptoTools
@@ -1 +1 @@
-Subproject commit 8239552d5b1919f6d8372268459680bc225037a8
+Subproject commit 6f762c941110b2aa90d2e2c5dc026d48e2e38bba
diff --git a/libOTe/Tools/Tools.cpp b/libOTe/Tools/Tools.cpp
@@ -706,7 +706,7 @@ namespace osuCrypto {
 
 					out0 -= out.stride();
 
-					t.blks[0] = (t.blks[0] << 1);
+					t.blks[0] = t.blks[0].slli_epi64(1);
 				}
 			}
 		}
diff --git a/libOTe/Triple/Foleage/FoleageTriple.cpp b/libOTe/Triple/Foleage/FoleageTriple.cpp
@@ -361,7 +361,7 @@ namespace osuCrypto
 		setTimePoint("input Mult");
 
 		// compress the resume and set the output.
-		auto outSize = std::min(mN, ALsb.size() * 128);
+		auto outSize = std::min<u64>(mN, ALsb.size() * 128);
 		std::vector<u8> A(mN);
 		for (u64 i = 0; i < outSize; ++i)
 		{

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ namespace osuCrypto`
`361`	`361`	`setTimePoint("input Mult");`
`362`	`362`
`363`	`363`	`// compress the resume and set the output.`
`364`		`- auto outSize = std::min(mN, ALsb.size() * 128);`
	`364`	`+ auto outSize = std::min<u64>(mN, ALsb.size() * 128);`
`365`	`365`	`std::vector<u8> A(mN);`
`366`	`366`	`for (u64 i = 0; i < outSize; ++i)`
`367`	`367`	`{`