From: ville <ville@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 3 Jan 2018 20:33:10 +0000 (+0000)
Subject: Protect optional's deduction guide with the feature macro
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1966389cb8efd0d7934ce50f2dcfcdb23193d0bf;p=thirdparty%2Fgcc.git

Protect optional's deduction guide with the feature macro

* include/std/optional: Use the feature macro.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@256185 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f603e316f109..64fa7204d84e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional
index 76b2b0e498d4..466a11c1e5f2 100644
--- 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