Remove dependency on Conv.h from FileUtil.h
authorAndrew Krieger <andrew.krieger@oculus.com>
Thu, 29 Jun 2017 00:12:01 +0000 (17:12 -0700)
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>
Thu, 29 Jun 2017 00:21:03 +0000 (17:21 -0700)
Summary: So we can use writeFile in projects which compile with -fno-rtti

Reviewed By: mzlee

Differential Revision: D5341469

fbshipit-source-id: bb77baf9576604ff862d54d59bf382862bd0dd58

folly/FileUtil.h

index 7386b934fe5ff96dda9a3b5f0a3d5363ff3c7403..d3260f917293013e3eeb9a518b58e8f0a4a12769 100644 (file)
@@ -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);