aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Edwards <pme@gcc.gnu.org>2002-06-03 05:03:50 +0000
committerPhil Edwards <pme@gcc.gnu.org>2002-06-03 05:03:50 +0000
commitc619473bdfba2989022baeee835577b3501a572d (patch)
tree27c87c34c11e6598fbcbc9a4a53a95fe5323aaaa
parent7f2e0dffc689c5b1234dcba0c7cd548ff8b3aff7 (diff)
downloadgcc-c619473bdfba2989022baeee835577b3501a572d.zip
gcc-c619473bdfba2989022baeee835577b3501a572d.tar.gz
gcc-c619473bdfba2989022baeee835577b3501a572d.tar.bz2
stl_bvector.h (swap(_Bit_reference,_Bit_reference)): Move/rename...
2002-06-03 Phil Edwards <pme@gcc.gnu.org> * include/bits/stl_bvector.h (swap(_Bit_reference,_Bit_reference)): Move/rename... (vector<bool>::swap(reference,reference)): ...to this. From-SVN: r54201
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/stl_bvector.h15
2 files changed, 14 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3f98c60..5565af1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
2002-06-03 Phil Edwards <pme@gcc.gnu.org>
+ * include/bits/stl_bvector.h (swap(_Bit_reference,_Bit_reference)):
+ Move/rename...
+ (vector<bool>::swap(reference,reference)): ...to this.
+
+2002-06-03 Phil Edwards <pme@gcc.gnu.org>
+
* docs/doxygen/TODO: Update.
* docs/doxygen/user.cfg.in (SORT_MEMBER_DOCS): Set to off, now that
some class members are in 14882 order.
diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index e48ad7d..0c78d7e 100644
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -91,13 +91,6 @@ public:
void flip() { *_M_p ^= _M_mask; }
};
-inline void swap(_Bit_reference __x, _Bit_reference __y)
-{
- bool __tmp = __x;
- __x = __y;
- __y = __tmp;
-}
-
struct _Bit_iterator_base : public iterator<random_access_iterator_tag, bool>
{
_Bit_type * _M_p;
@@ -635,6 +628,14 @@ template <typename _Alloc>
std::swap(_M_finish, __x._M_finish);
std::swap(_M_end_of_storage, __x._M_end_of_storage);
}
+
+ // [23.2.5]/1, third-to-last entry in synopsis listing
+ static void swap(reference __x, reference __y) {
+ bool __tmp = __x;
+ __x = __y;
+ __y = __tmp;
+ }
+
iterator insert(iterator __position, bool __x = bool()) {
difference_type __n = __position - begin();
if (_M_finish._M_p != _M_end_of_storage && __position == end())