From 5c304ef79996122080bd44c89c8910bd8a1f8160 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eniebler@fb.com>
Date: Thu, 1 Sep 2016 11:06:06 -0700
Subject: [PATCH] Add ScopeGuard.h include in places where it is needed.

Summary: Fix code that is transitively including ScopeGuard.h via FBString.h.

Reviewed By: yfeldblum

Differential Revision: D3801328

fbshipit-source-id: 7e1dc37cd6dd3aa691dd1baf31385d3a8c51eed0
---
 folly/futures/detail/Core.h   | 3 ++-
 folly/test/ThreadNameTest.cpp | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/folly/futures/detail/Core.h b/folly/futures/detail/Core.h
index 7ef597a0..66a6e74c 100644
--- a/folly/futures/detail/Core.h
+++ b/folly/futures/detail/Core.h
@@ -25,9 +25,10 @@
 #include <folly/Function.h>
 #include <folly/MicroSpinLock.h>
 #include <folly/Optional.h>
+#include <folly/ScopeGuard.h>
+#include <folly/Try.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
-#include <folly/Try.h>
 #include <folly/futures/detail/FSM.h>
 
 #include <folly/io/async/Request.h>
diff --git a/folly/test/ThreadNameTest.cpp b/folly/test/ThreadNameTest.cpp
index ec59687a..b4618c37 100644
--- a/folly/test/ThreadNameTest.cpp
+++ b/folly/test/ThreadNameTest.cpp
@@ -16,6 +16,7 @@
 
 #include <thread>
 #include <folly/Baton.h>
+#include <folly/ScopeGuard.h>
 #include <folly/ThreadName.h>
 #include <gtest/gtest.h>
 
-- 
2.34.1