folly::copy

[folly.git] / folly / test / SpinLockTest.cpp

diff --git a/folly/test/SpinLockTest.cpp b/folly/test/SpinLockTest.cpp
index 6d028af1e0f923a8436f4f247c641f8afe0fad19..3b10b5dbb59c3dfd391c7fc1075690cbde659a99 100644 (file)
--- a/folly/test/SpinLockTest.cpp
+++ b/folly/test/SpinLockTest.cpp
@@ -17,10 +17,10 @@
 
 #include <folly/Random.h>
 
-#include <gtest/gtest.h>
 #include <thread>
 
 #include <folly/portability/Asm.h>
+#include <folly/portability/GTest.h>
 
 using folly::SpinLockGuardImpl;
 
@@ -45,8 +45,8 @@ void spinlockTestThread(LockedVal<LOCK>* v) {
     SpinLockGuardImpl<LOCK> g(v->lock);
 
     int first = v->ar[0];
-    for (size_t i = 1; i < sizeof v->ar / sizeof i; ++i) {
-      EXPECT_EQ(first, v->ar[i]);
+    for (size_t j = 1; j < sizeof v->ar / sizeof j; ++j) {
+      EXPECT_EQ(first, v->ar[j]);
     }
 
     int byte = folly::Random::rand32(rng);