public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [v3 PATCH] Protect optional's deduction guide with the feature macro
@ 2018-01-03 14:34 Ville Voutilainen
  2018-01-03 19:57 ` Jonathan Wakely
  0 siblings, 1 reply; 2+ messages in thread
From: Ville Voutilainen @ 2018-01-03 14:34 UTC (permalink / raw)
  To: gcc-patches, libstdc++

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

Tested partially on Linux-x64, finishing testing the full suite on
Linux-PPC64. Ok for trunk?

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.

[-- Attachment #2: optional_deduction_guide.diff --]
[-- Type: text/plain, Size: 421 bytes --]

diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional
index e017eed..f7c72b5 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [v3 PATCH] Protect optional's deduction guide with the feature macro
  2018-01-03 14:34 [v3 PATCH] Protect optional's deduction guide with the feature macro Ville Voutilainen
@ 2018-01-03 19:57 ` Jonathan Wakely
  0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Wakely @ 2018-01-03 19:57 UTC (permalink / raw)
  To: Ville Voutilainen; +Cc: gcc-patches, libstdc++

On 03/01/18 16:34 +0200, Ville Voutilainen wrote:
>Tested partially on Linux-x64, finishing testing the full suite on
>Linux-PPC64. Ok for trunk?

Yes, and gcc-7-branch please. Thanks.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-03 19:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-03 14:34 [v3 PATCH] Protect optional's deduction guide with the feature macro Ville Voutilainen
2018-01-03 19:57 ` Jonathan Wakely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).