Fix unittest compile error on futures/test/RetryingTest.cpp.
authorMohamed Amin JABRI <amin.jabri@gmail.com>
Wed, 27 Sep 2017 17:38:18 +0000 (10:38 -0700)
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>
Wed, 27 Sep 2017 17:51:27 +0000 (10:51 -0700)
Summary:
On MacOS compiling unittests with "make chek" shows the following compile
error:
```
../futures/test/RetryingTest.cpp:168:26: error: no matching function for call to 'min'
 newMemLimit.rlim_cur = std::min(1UL << 30, oldMemLimit.rlim_max);
```
Closes https://github.com/facebook/folly/pull/680

Reviewed By: elsteveogrande

Differential Revision: D5921433

Pulled By: yfeldblum

fbshipit-source-id: 236d8336f852750a983c2e268db8811d1a4ed9ee

folly/futures/test/RetryingTest.cpp

index 59eb3e0156a6110686c26a572ebd48a3ebf0dca8..61505c6a11f3ad71a3ec14151e89d1684d092a74 100644 (file)
@@ -165,7 +165,8 @@ TEST(RetryingTest, large_retries) {
   PCHECK(getrlimit(RLIMIT_AS, &oldMemLimit) == 0);
 
   rlimit newMemLimit;
-  newMemLimit.rlim_cur = std::min(1UL << 30, oldMemLimit.rlim_max);
+  newMemLimit.rlim_cur =
+      std::min(static_cast<rlim_t>(1UL << 30), oldMemLimit.rlim_max);
   newMemLimit.rlim_max = oldMemLimit.rlim_max;
   if (!folly::kIsSanitizeAddress) { // ASAN reserves outside of the rlimit
     PCHECK(setrlimit(RLIMIT_AS, &newMemLimit) == 0);