From: Andrew Krieger <andrew.krieger@oculus.com>
Date: Thu, 29 Jun 2017 00:12:01 +0000 (-0700)
Subject: Remove dependency on Conv.h from FileUtil.h
X-Git-Tag: v2017.07.03.00~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ffc409c4cdcb5c29991372e7c5478863350c38e8;p=folly.git

Remove dependency on Conv.h from FileUtil.h

Summary: So we can use writeFile in projects which compile with -fno-rtti

Reviewed By: mzlee

Differential Revision: D5341469

fbshipit-source-id: bb77baf9576604ff862d54d59bf382862bd0dd58
---

diff --git a/folly/FileUtil.h b/folly/FileUtil.h
index 7386b934..d3260f91 100644
--- a/folly/FileUtil.h
+++ b/folly/FileUtil.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/Conv.h>
 #include <folly/Portability.h>
+#include <folly/Range.h>
 #include <folly/ScopeGuard.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/SysUio.h>
@@ -139,8 +139,7 @@ bool readFile(
   constexpr size_t initialAlloc = 1024 * 4;
   out.resize(
     std::min(
-      buf.st_size > 0 ? folly::to<size_t>(buf.st_size + 1) : initialAlloc,
-      num_bytes));
+      buf.st_size > 0 ? (size_t(buf.st_size) + 1) : initialAlloc, num_bytes));
 
   while (soFar < out.size()) {
     const auto actual = readFull(fd, &out[soFar], out.size() - soFar);