From: Andrii Grynenko <andrii@fb.com>
Date: Fri, 10 Jun 2016 22:25:44 +0000 (-0700)
Subject: Fix folly::fibers on OSX with boost 1.60
X-Git-Tag: 2016.07.26~148
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=6d52608a55d3c0b1f7c9b6ed2fc4d43bc2ddcc0d

Fix folly::fibers on OSX with boost 1.60

Summary: We only need fcontext.hpp, so let's include it directly. all.hpp includes other headers, which use thread-locals (doesn't work with our OSX build).

Reviewed By: igorsugak, bhamiltoncx

Differential Revision: D3419638

fbshipit-source-id: b4fa1bd14454bcd75eaece52c398ac6510273773
---

diff --git a/folly/fibers/BoostContextCompatibility.h b/folly/fibers/BoostContextCompatibility.h
index e243767d..4aede8f8 100644
--- a/folly/fibers/BoostContextCompatibility.h
+++ b/folly/fibers/BoostContextCompatibility.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <boost/context/all.hpp>
+#include <boost/context/fcontext.hpp>
 #include <boost/version.hpp>
 
 /**
diff --git a/folly/fibers/Fiber.h b/folly/fibers/Fiber.h
index 543deef8..f543321b 100644
--- a/folly/fibers/Fiber.h
+++ b/folly/fibers/Fiber.h
@@ -18,8 +18,6 @@
 #include <functional>
 #include <typeinfo>
 
-#include <boost/context/all.hpp>
-#include <boost/version.hpp>
 #include <folly/AtomicIntrusiveLinkedList.h>
 #include <folly/CPortability.h>
 #include <folly/Function.h>
diff --git a/folly/m4/ax_boost_context.m4 b/folly/m4/ax_boost_context.m4
index 6843c390..46517c97 100644
--- a/folly/m4/ax_boost_context.m4
+++ b/folly/m4/ax_boost_context.m4
@@ -69,7 +69,7 @@ AC_DEFUN([AX_BOOST_CONTEXT],
 			CXXFLAGS_SAVE=$CXXFLAGS
 
 			AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-				[[@%:@include <boost/context/all.hpp>
+				[[@%:@include <boost/context/fcontext.hpp>
 #include <boost/version.hpp>
 ]],
 				[[#if BOOST_VERSION >= 105600