Use folly/portability/GTest.h in folly/executurs/test/

[folly.git] / folly / Foreach.h

diff --git a/folly/Foreach.h b/folly/Foreach.h
index 34d074f10bb9631401ddbc7d888a6154d5c92eaa..ae0e865d92340c82608f47fe1f87142f0d01ae48 100644 (file)
--- a/folly/Foreach.h
+++ b/folly/Foreach.h
@@ -216,7 +216,7 @@ class HasLess {
   template <typename, typename> static BiggerThanChar test(...);
 
  public:
-  enum { value = sizeof(test<T, U>(0)) == 1 };
+  enum { value = sizeof(test<T, U>(nullptr)) == 1 };
 };
 
 /**
@@ -291,7 +291,9 @@ downTo(T& iter, const U& begin) {
 template <class T, class U>
 typename std::enable_if<!HasLess<U, T>::value, bool>::type
 downTo(T& iter, const U& begin) {
-  if (iter == begin) return false;
+  if (iter == begin) {
+    return false;
+  }
   --iter;
   return true;
 }