diff options
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.tcc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/deque | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/vector | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 34a373c..204757b 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -52,7 +52,7 @@ namespace std template<typename _Type> inline bool - __is_null_pointer(const _Type&) + __is_null_pointer(_Type) { return false; } template<typename _CharT, typename _Traits, typename _Alloc> diff --git a/libstdc++-v3/include/debug/deque b/libstdc++-v3/include/debug/deque index b9d68af..818d59e 100644 --- a/libstdc++-v3/include/debug/deque +++ b/libstdc++-v3/include/debug/deque @@ -294,7 +294,7 @@ namespace __gnu_debug_def // _GLIBCXX_RESOLVE_LIB_DEFECTS // 151. can't currently clear() empty container __glibcxx_check_erase_range(__first, __last); - if (__first == begin() || __last == end()-1) + if (__first == begin() || __last == end()) { this->_M_detach_singular(); for (iterator __position = __first; __position != __last; ) diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector index 19249b6..53e6f0c 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -34,6 +34,7 @@ #include <vector> #include <debug/safe_sequence.h> #include <debug/safe_iterator.h> +#include <utility> namespace __gnu_debug_def { @@ -328,6 +329,7 @@ namespace __gnu_debug_def { _Base::swap(__x); this->_M_swap(__x); + std::swap(_M_guaranteed_capacity, __x._M_guaranteed_capacity); } void @@ -335,6 +337,7 @@ namespace __gnu_debug_def { _Base::clear(); this->_M_invalidate_all(); + _M_guaranteed_capacity = 0; } _Base& |