From 8b4915f32120d2c40171ac3e35ffbf6562d6b3f3 Mon Sep 17 00:00:00 2001
From: Jan Wassenberg <janwas@google.com>
Date: Tue, 30 Jul 2024 03:21:56 -0700
Subject: [PATCH] Fix Windows build - macro conflict with param name

PiperOrigin-RevId: 657518587
---
 gemma/gemma-inl.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gemma/gemma-inl.h b/gemma/gemma-inl.h
index 02c0c44..0613b92 100644
--- a/gemma/gemma-inl.h
+++ b/gemma/gemma-inl.h
@@ -577,13 +577,13 @@ HWY_NOINLINE void TransformerLayer(
 class PrefillState {
   // TODO: move helper functions, also those in app.h, to a threading header
   using LPS = hwy::LogicalProcessorSet;
-  LPS Intersection(const LPS& big, const LPS& small) {
-    LPS both;
+  LPS Intersection(const LPS& big_set, const LPS& small_set) {
+    LPS both_set;
     // Reduce expected work by iterating over the smaller set.
-    small.Foreach([big, &both](size_t idx) {
-      if (big.Get(idx)) both.Set(idx);
+    small_set.Foreach([&big_set, &both_set](size_t idx) {
+      if (big_set.Get(idx)) both_set.Set(idx);
     });
-    return both;
+    return both_set;
   }
 
   std::vector<size_t> CoresInLPS(const LPS& cluster) {