diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-11 22:32:01 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-11 22:32:01 +0000 |
| commit | 0f0ce5ae5016cde1b60d7dc9b76d76497df816a8 (patch) | |
| tree | 18bf2f094ffa4469352b648b932b7f456d33a389 /libstdc++-v3/include/debug/bitset | |
| parent | cd6d4e14e5339aad3280ee24b26af77b23f4599d (diff) | |
| download | ppe42-gcc-0f0ce5ae5016cde1b60d7dc9b76d76497df816a8.tar.gz ppe42-gcc-0f0ce5ae5016cde1b60d7dc9b76d76497df816a8.zip | |
2010-10-11 Jonathan Wakely <jwakely.gcc@gmail.com>
* testsuite/23_containers/bitset/cons/2.cc: Tweak.
2010-10-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/bitset (bitset<>::bitset(const _CharT*,
typename std::basic_string<>::size_type, _CharT, _CharT)):
Implement new proposed resolution for DR 1325.
* include/debug/bitset: Likewise.
* include/profile/bitset: Likewise.
* testsuite/23_containers/bitset/cons/dr1325-1.cc: New.
* testsuite/23_containers/bitset/cons/dr1325-2.cc: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165338 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug/bitset')
| -rw-r--r-- | libstdc++-v3/include/debug/bitset | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset index 017c9e020dd..739dcfd38f1 100644 --- a/libstdc++-v3/include/debug/bitset +++ b/libstdc++-v3/include/debug/bitset @@ -150,8 +150,13 @@ namespace __debug bitset(const _Base& __x) : _Base(__x), _Safe_base() { } #ifdef __GXX_EXPERIMENTAL_CXX0X__ - explicit - bitset(const char* __str) : _Base(__str) { } + template<typename _CharT> + explicit + bitset(const _CharT* __str, + typename std::basic_string<_CharT>::size_type __n + = std::basic_string<_CharT>::npos, + _CharT __zero = _CharT('0'), _CharT __one = _CharT('1')) + : _Base(__str, __n, __zero, __one) { } #endif // 23.3.5.2 bitset operations: |
