From: James Sedgwick <jsedgwick@fb.com>
Date: Thu, 16 Apr 2015 19:18:42 +0000 (-0700)
Subject: fix build
X-Git-Tag: v0.36.0~33
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f706bdbd7f75c3da3d7984944d80b36c44ce8d55;p=folly.git

fix build

Summary:
^

Test Plan: compiles

Reviewed By: hans@fb.com

Subscribers: folly-diffs@, jsedgwick, yfeldblum, chalfant

FB internal diff: D1998822

Signature: t1:1998822:1429211074:3ff9b0827a8ce029efa06a4a78ecea2b07eae3a8
---

diff --git a/folly/futures/Future-inl.h b/folly/futures/Future-inl.h
index 186afe36..abcfcb86 100644
--- a/folly/futures/Future-inl.h
+++ b/folly/futures/Future-inl.h
@@ -345,7 +345,7 @@ Future<T>::onError(F&& func) {
       try {
         auto f2 = (*funcm)(std::move(t.exception()));
         f2.setCallback_([pm](Try<T> t2) mutable {
-          pm->fulfilTry(std::move(t2));
+          pm->setTry(std::move(t2));
         });
       } catch (const std::exception& e2) {
         pm->setException(exception_wrapper(std::current_exception(), e2));
@@ -353,7 +353,7 @@ Future<T>::onError(F&& func) {
         pm->setException(exception_wrapper(std::current_exception()));
       }
     } else {
-      pm->fulfilTry(std::move(t));
+      pm->setTry(std::move(t));
     }
   });
 
@@ -378,11 +378,11 @@ Future<T>::onError(F&& func) {
   auto funcm = folly::makeMoveWrapper(std::move(func));
   setCallback_([pm, funcm](Try<T> t) mutable {
     if (t.hasException()) {
-      pm->fulfil([&]{
+      pm->setWith([&]{
         return (*funcm)(std::move(t.exception()));
       });
     } else {
-      pm->fulfilTry(std::move(t));
+      pm->setTry(std::move(t));
     }
   });