Determine noexcept'ness of folly::Optional with std::is_nothrow_constructible

Summary: Because MSVC is not happy about how it's written now.

Reviewed By: yfeldblum

Differential Revision: D5378740

fbshipit-source-id: 8b77d1a05da75b331e0cb72bd0ad859b89e54b36

diff --git a/folly/Optional.h b/folly/Optional.h
index c6980c186632a1f3183f9f5db93cb5e2b1ecc452..ce8bcf1aa6346c7fcd4c69e6236c8d2192f565d3 100644 (file)
--- a/folly/Optional.h
+++ b/folly/Optional.h
@@ -128,8 +128,8 @@ class Optional {
   }
 
   template <typename... Args>
-  explicit Optional(in_place_t, Args&&... args)
-    noexcept(noexcept(::new (nullptr) Value(std::declval<Args&&>()...))) {
+  explicit Optional(in_place_t, Args&&... args) noexcept(
+      std::is_nothrow_constructible<Value, Args...>::value) {
     construct(std::forward<Args>(args)...);
   }