From: Ville Voutilainen Date: Wed, 3 Jan 2018 20:33:10 +0000 (+0200) Subject: Protect optional's deduction guide with the feature macro X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8bdbeed1d0b00bc21a105712b1b672ebec37358e;p=gcc.git Protect optional's deduction guide with the feature macro * include/std/optional: Use the feature macro. From-SVN: r256185 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f603e316f10..64fa7204d84 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-01-03 Ville Voutilainen + + Protect optional's deduction guide with the feature macro + * include/std/optional: Use the feature macro. + 2018-01-03 Jakub Jelinek Update copyright years. diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index 76b2b0e498d..466a11c1e5f 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 optional(_Tp) -> optional<_Tp>; +#endif _GLIBCXX_END_NAMESPACE_VERSION } // namespace std