From 70d3004b2507a4e93ad0ca11e77d9dd2f2c620b8 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Thu, 19 Oct 2017 11:37:54 -0700 Subject: [PATCH] Fix fibers build on older boost Summary: [Folly] Fix `folly/fibers/` build on older boost. Where `jump_fcontext` takes `intptr_t` rather than an actual pointer, and we warn about implicit conversions from pointers to integral types. Reviewed By: Orvid Differential Revision: D6098230 fbshipit-source-id: 61bd7bdff5de728d3febe8b35c97d024ab6f236a --- folly/fibers/BoostContextCompatibility.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/folly/fibers/BoostContextCompatibility.h b/folly/fibers/BoostContextCompatibility.h index 2f6cc127..5531684a 100644 --- a/folly/fibers/BoostContextCompatibility.h +++ b/folly/fibers/BoostContextCompatibility.h @@ -106,9 +106,9 @@ class FiberImpl { boost::context::jump_fcontext(&fiberContext_, mainContext_, 0); #elif BOOST_VERSION >= 105200 auto context = - boost::context::jump_fcontext(fiberContext_, &mainContext_, nullptr); + boost::context::jump_fcontext(fiberContext_, &mainContext_, 0); #else - auto context = jump_fcontext(&fiberContext_, &mainContext_, nullptr); + auto context = jump_fcontext(&fiberContext_, &mainContext_, 0); #endif DCHECK_EQ(this, reinterpret_cast(context)); } -- 2.34.1