From 2838468cc33125cf9948190cf2b8509ac9b0cd9c Mon Sep 17 00:00:00 2001 From: Paolo Carlini <paolo.carlini@oracle.com> Date: Tue, 29 Dec 2009 00:29:12 +0000 Subject: [PATCH] bitset (bitset<>::bitset(const char*)): Add. 2009-12-28 Paolo Carlini <paolo.carlini@oracle.com> * include/debug/bitset (bitset<>::bitset(const char*)): Add. * include/profile/bitset (bitset<>::bitset(const char*)): Likewise. From-SVN: r155498 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/debug/bitset | 5 +++++ libstdc++-v3/include/profile/bitset | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 333a51f7d149..c20bc0d652dc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2009-12-28 Paolo Carlini <paolo.carlini@oracle.com> + + * include/debug/bitset (bitset<>::bitset(const char*)): Add. + * include/profile/bitset (bitset<>::bitset(const char*)): Likewise. + 2009-12-24 Edward Smith-Rowland <3dw4rd@verizon.net> Paolo Carlini <paolo.carlini@oracle.com> diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset index c6203d9a985e..5e5f35dcf1f3 100644 --- a/libstdc++-v3/include/debug/bitset +++ b/libstdc++-v3/include/debug/bitset @@ -144,6 +144,11 @@ namespace __debug bitset(const _Base& __x) : _Base(__x), _Safe_base() { } +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + explicit + bitset(const char* __str) : _Base(__str) { } +#endif + // 23.3.5.2 bitset operations: bitset<_Nb>& operator&=(const bitset<_Nb>& __rhs) diff --git a/libstdc++-v3/include/profile/bitset b/libstdc++-v3/include/profile/bitset index e1be8b8d1cac..1d8ad9f0ffa0 100644 --- a/libstdc++-v3/include/profile/bitset +++ b/libstdc++-v3/include/profile/bitset @@ -121,6 +121,11 @@ namespace __profile bitset(const _Base& __x) : _Base(__x) { } +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + explicit + bitset(const char* __str) : _Base(__str) { } +#endif + // 23.3.5.2 bitset operations: bitset<_Nb>& operator&=(const bitset<_Nb>& __rhs) -- GitLab