@@ -491,14 +491,14 @@ class StdBitIteratorPrinter:
return bool(self.val['_M_p'].dereference() & (1 << self.val['_M_offset']))
class StdBitReferencePrinter:
- "Print std::_Bit_reference"
+ "Print std::vector<bool>::reference"
def __init__(self, typename, val):
self.val = val
def to_string(self):
if not self.val['_M_p']:
- return 'invalid std::_Bit_reference'
+ return 'invalid std::vector<bool>::reference'
return bool(self.val['_M_p'].dereference() & (self.val['_M_mask']))
class StdTuplePrinter:
@@ -2052,11 +2052,11 @@ def build_libstdcxx_dictionary ():
StdDequeIteratorPrinter)
libstdcxx_printer.add_version('__gnu_cxx::', '__normal_iterator',
StdVectorIteratorPrinter)
- libstdcxx_printer.add_version('std::', '_Bit_iterator',
+ libstdcxx_printer.add_container('std::', '_Bit_iterator',
StdBitIteratorPrinter)
- libstdcxx_printer.add_version('std::', '_Bit_const_iterator',
+ libstdcxx_printer.add_container('std::', '_Bit_const_iterator',
StdBitIteratorPrinter)
- libstdcxx_printer.add_version('std::', '_Bit_reference',
+ libstdcxx_printer.add_container('std::', '_Bit_reference',
StdBitReferencePrinter)
libstdcxx_printer.add_version('__gnu_cxx::', '_Slist_iterator',
StdSlistIteratorPrinter)
@@ -144,19 +144,19 @@ main()
std::vector<bool>::iterator vbIt0;
// { dg-final { note-test vbIt0 {non-dereferenceable iterator for std::vector<bool>} } }
- std::_Bit_reference br = *vb.begin();
+ std::vector<bool>::reference br = *vb.begin();
// { dg-final { note-test br {true} } }
- std::_Bit_reference br2 = *vbIt2;
+ std::vector<bool>::reference br2 = *vbIt2;
// { dg-final { note-test br2 {true} } }
- std::_Bit_reference br3 = *vbIt3;
+ std::vector<bool>::reference br3 = *vbIt3;
// { dg-final { note-test br3 {false} } }
- std::_Bit_reference br4 = *vbIt4;
+ std::vector<bool>::reference br4 = *vbIt4;
// { dg-final { note-test br4 {false} } }
- std::_Bit_reference br5 = *vbIt5;
+ std::vector<bool>::reference br5 = *vbIt5;
// { dg-final { note-test br5 {true} } }
- std::_Bit_reference br0;
-// { dg-final { note-test br0 {invalid std::_Bit_reference} } }
+ std::vector<bool>::reference br0;
+// { dg-final { note-test br0 {invalid std::vector<bool>::reference} } }
__gnu_cxx::slist<int> sll;
sll.push_front(23);
@@ -137,19 +137,19 @@ main()
std::vector<bool>::iterator vbIt0;
// { dg-final { note-test vbIt0 {non-dereferenceable iterator for std::vector<bool>} } }
- std::_Bit_reference br = *vb.begin();
+ std::vector<bool>::reference br = *vb.begin();
// { dg-final { note-test br {true} } }
- std::_Bit_reference br2 = *vbIt2;
+ std::vector<bool>::reference br2 = *vbIt2;
// { dg-final { note-test br2 {true} } }
- std::_Bit_reference br3 = *vbIt3;
+ std::vector<bool>::reference br3 = *vbIt3;
// { dg-final { note-test br3 {false} } }
- std::_Bit_reference br4 = *vbIt4;
+ std::vector<bool>::reference br4 = *vbIt4;
// { dg-final { note-test br4 {false} } }
- std::_Bit_reference br5 = *vbIt5;
+ std::vector<bool>::reference br5 = *vbIt5;
// { dg-final { note-test br5 {true} } }
- std::_Bit_reference br0;
-// { dg-final { note-test br0 {invalid std::_Bit_reference} } }
+ std::vector<bool>::reference br0;
+// { dg-final { note-test br0 {invalid std::vector<bool>::reference} } }
__gnu_cxx::slist<int> sll;
sll.push_front(23);