diff options
| author | Ville Voutilainen <ville.voutilainen@gmail.com> | 2016-12-01 09:14:19 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville@gcc.gnu.org> | 2016-12-01 09:14:19 +0200 |
| commit | d9b2d86c74a2153b07fb9d63baf220d385043a9d (patch) | |
| tree | a94d475c4ea306395f365d810a020e23a68218ca /libstdc++-v3 | |
| parent | f73ee211c30c292316ffa6f55eca3531c67a4de7 (diff) | |
| download | gcc-d9b2d86c74a2153b07fb9d63baf220d385043a9d.zip gcc-d9b2d86c74a2153b07fb9d63baf220d385043a9d.tar.gz gcc-d9b2d86c74a2153b07fb9d63baf220d385043a9d.tar.bz2 | |
The convertible_to traits need to use a variadic catch-all for the false-cases.
The convertible_to traits need to use a variadic catch-all for the
false-cases.
* include/std/istream (__is_convertible_to_basic_istream):
Change the parameter of the false-case of __check to a variadic.
* include/std/ostream (__is_convertible_to_basic_ostream):
Likewise.
From-SVN: r243098
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/istream | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/ostream | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b5f94c0..cc0b3ae 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2016-12-01 Ville Voutilainen <ville.voutilainen@gmail.com> + + The convertible_to traits need to use a variadic catch-all for the + false-cases. + * include/std/istream (__is_convertible_to_basic_istream): + Change the parameter of the false-case of __check to a variadic. + * include/std/ostream (__is_convertible_to_basic_ostream): + Likewise. + 2016-12-01 Bernd Edlinger <bernd.edlinger@hotmail.de> * crossconfig.m4 (*-linux*): Add link-check for memalign. diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index 319e226..1d77d30 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -915,7 +915,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Ch, typename _Up> static basic_istream<_Ch, _Up>& __check(basic_istream<_Ch, _Up>*); - static void __check(void*); + static void __check(...); public: using istream_type = decltype(__check(declval<typename remove_reference<_Tp>::type*>())); diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream index 70fd10b..9dea778 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -619,7 +619,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Ch, typename _Up> static basic_ostream<_Ch, _Up>& __check(basic_ostream<_Ch, _Up>*); - static void __check(void*); + static void __check(...); public: using ostream_type = decltype(__check(declval<typename remove_reference<_Tp>::type*>())); |