Fix std::max() call in Compression.cpp

[folly.git] / folly / detail / CacheLocality.cpp

diff --git a/folly/detail/CacheLocality.cpp b/folly/detail/CacheLocality.cpp
index 4603c1d5b0bf39a427fa46a41d3ec9863d8672fb..09da2871592999375cfa38f3b29227347678da4e 100644 (file)
--- a/folly/detail/CacheLocality.cpp
+++ b/folly/detail/CacheLocality.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ static CacheLocality getSystemLocalityInfo() {
     // wiggle room
     numCpus = 32;
   }
-  return CacheLocality::uniform(numCpus);
+  return CacheLocality::uniform(size_t(numCpus));
 }
 
 template <>
@@ -156,11 +156,12 @@ CacheLocality CacheLocality::readFromSysfsTree(
               // a sub-optimal ordering, but it won't crash
               auto& lhsEquiv = equivClassesByCpu[lhs];
               auto& rhsEquiv = equivClassesByCpu[rhs];
-              for (int i = int(std::min(lhsEquiv.size(), rhsEquiv.size())) - 1;
+              for (ssize_t i = ssize_t(std::min(lhsEquiv.size(), rhsEquiv.size())) - 1;
                    i >= 0;
                    --i) {
-                if (lhsEquiv[i] != rhsEquiv[i]) {
-                  return lhsEquiv[i] < rhsEquiv[i];
+                auto idx = size_t(i);
+                if (lhsEquiv[idx] != rhsEquiv[idx]) {
+                  return lhsEquiv[idx] < rhsEquiv[idx];
                 }
               }