[pytorch] Remove c10::nullopt_t::init (#47013)

swolchok · facebook-github-bot · commit 17be8ae11a52 · 2020-11-04T14:14:55.000-08:00
Summary: Pull Request resolved: #47013 It was getting used in client code, and it's not part of `std::optional`. ghstack-source-id: 115769682 Test Plan: Existing tests Reviewed By: smessmer Differential Revision: D24547710 fbshipit-source-id: a24e0fd03aba1cd996c85b12bb5dcdb3e7af46b5
diff --git a/aten/src/ATen/TensorIndexing.h b/aten/src/ATen/TensorIndexing.h
@@ -13,7 +13,7 @@ const int64_t INDEX_MIN = std::numeric_limits<int64_t>::min();
 
 enum class TensorIndexType { None, Ellipsis, Integer, Boolean, Slice, Tensor };
 
-constexpr c10::nullopt_t None{c10::nullopt_t::init()};
+constexpr c10::nullopt_t None = c10::nullopt;
 
 struct CAFFE2_API EllipsisIndexType final { EllipsisIndexType() {} };
 CAFFE2_API extern const EllipsisIndexType Ellipsis;
diff --git a/c10/util/Optional.h b/c10/util/Optional.h
@@ -137,10 +137,9 @@ constexpr struct trivial_init_t {
 
 // 20.5.7, Disengaged state indicator
 struct nullopt_t {
-  struct init {};
-  constexpr explicit nullopt_t(init) {}
+  constexpr explicit nullopt_t(int) {}
 };
-constexpr nullopt_t nullopt{nullopt_t::init()};
+constexpr nullopt_t nullopt {0};
 
 // 20.5.8, class bad_optional_access
 class bad_optional_access : public std::logic_error {
