From 908667879945d22a2f026559cbd4c5d9cc0bebaa Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <pbrady@fb.com>
Date: Tue, 23 Jan 2018 10:47:49 -0800
Subject: [PATCH] folly: fix make_optional compliation issue with gnu++17

Summary:
This clashes with std::make_optional with -std=gnu++17 giving:
  call of overloaded 'make_optional(std::__cxx11::basic_string<char>)' is ambiguous

Reviewed By: yfeldblum

Differential Revision: D6780579

fbshipit-source-id: fea8c76869e4d9b744fc3182379328a91879b1d2
---
 folly/system/ThreadName.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/folly/system/ThreadName.cpp b/folly/system/ThreadName.cpp
index ae433cc8..d661ad02 100644
--- a/folly/system/ThreadName.cpp
+++ b/folly/system/ThreadName.cpp
@@ -88,7 +88,7 @@ Optional<std::string> getThreadName(std::thread::id id) {
   if (pthread_getname_np(stdTidToPthreadId(id), buf.data(), buf.size()) != 0) {
     return Optional<std::string>();
   }
-  return make_optional(std::string(buf.data()));
+  return folly::make_optional(std::string(buf.data()));
 #else
   return Optional<std::string>();
 #endif
-- 
2.34.1