OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Protect optional's deduction guide with the feature macro 

Backport from mainline
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.

From-SVN: r256261
This commit is contained in:
Ville Voutilainen 2018-01-04 20:58:29 +02:00 committed by Ville Voutilainen
parent a03a98143d
commit 166d8f080c
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2018-01-04 Ville Voutilainen <ville.voutilainen@gmail.com>
Backport from mainline
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.
2017-12-28 François Dumont <fdumont@gcc.gnu.org>
Backport from mainline

2
libstdc++-v3/include/std/optional
View File

@ -1031,7 +1031,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// @}
#if __cpp_deduction_guides >= 201606
template <typename _Tp> optional(_Tp) -> optional<_Tp>;
#endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std