Protect optional's deduction guide with the feature macro

* include/std/optional: Use the feature macro. From-SVN: r256185

Protect optional's deduction guide with the feature macro
* include/std/optional: Use the feature macro. From-SVN: r256185
8bdbeed1 · Ville Voutilainen · Ville Voutilainen · 72df5daa · 8bdbeed1 · 8bdbeed1
Commit 8bdbeed1 authored Jan 03, 2018 by Ville Voutilainen Committed by Ville Voutilainen Jan 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

libstdc++-v3/ChangeLog
+5 -0

libstdc++-v3/include/std/optional
+2 -0

No files found.
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
+2018-01-03  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+	Protect optional's deduction guide with the feature macro
+	* include/std/optional: Use the feature macro.
+
 2018-01-03  Jakub Jelinek  <jakub@redhat.com>

 	Update copyright years.

--- a/libstdc++-v3/include/std/optional
+++ b/libstdc++-v3/include/std/optional
@@ -1038,7 +1038,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION

  /// @}

+#if __cpp_deduction_guides >= 201606
  template <typename _Tp> optional(_Tp) -> optional<_Tp>;
+#endif

 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std