update dev300-m58
[ooovba.git] / stlport / STLport-4.5-gcc43_warnings.patch
blobf5e1d4b5c08819fc876c3ebb4f61f8462f46ceb5
1 --- misc/STLport-4.5/src/num_get_float.cpp 2001-05-03 09:40:43.000000000 +0200
2 +++ misc/build/STLport-4.5/src/num_get_float.cpp 2009-03-22 17:31:30.000000000 +0100
3 @@ -484,7 +484,7 @@
4 else { /* not zero or denorm */
5 /* Round to 53 bits */
7 - rest = value & (1<<10)-1;
8 + rest = value & ((1<<10)-1);
9 value >>= 10;
10 #if !defined(__SC__)
11 guard = (uint32) value & 1;
12 --- misc/STLport-4.5/src/strstream.cpp 2001-01-27 02:39:29.000000000 +0100
13 +++ misc/build/STLport-4.5/src/strstream.cpp 2009-03-22 17:26:32.000000000 +0100
14 @@ -284,11 +284,12 @@
16 void strstreambuf::_M_free(char* p)
18 - if (p)
19 + if (p) {
20 if (_M_free_fun)
21 _M_free_fun(p);
22 else
23 delete[] p;
24 + }
27 void strstreambuf::_M_setup(char* get, char* put, streamsize n)
28 --- misc/STLport-4.5/stlport/stl/_list.c 2001-05-11 04:20:07.000000000 +0200
29 +++ misc/build/STLport-4.5/stlport/stl/_list.c 2009-03-22 17:26:32.000000000 +0100
30 @@ -82,7 +82,7 @@
32 iterator __i = begin();
33 size_type __len = 0;
34 - for ( ; __i != end() && __len < __new_size; ++__i, ++__len);
35 + for ( ; __i != end() && __len < __new_size; ++__i, ++__len) ;
37 if (__len == __new_size)
38 erase(__i, end());
39 --- misc/STLport-4.5/stlport/stl/_time_facets.c 2001-03-19 08:01:09.000000000 +0100
40 +++ misc/build/STLport-4.5/stlport/stl/_time_facets.c 2009-03-22 17:26:32.000000000 +0100
41 @@ -101,7 +101,7 @@
43 while (__first != __last) {
44 for (__i = 0; __i < __n; ++__i)
45 - if (__do_check[__i])
46 + if (__do_check[__i]) {
47 if (*__first == __name[__i][__pos]) {
48 if (__pos == _DiffType(__name[__i].size()) - 1) {
49 __do_check[__i] = 0;
50 @@ -119,6 +119,7 @@
51 if (__check_count == 0)
52 return __matching_name[__pos];
54 + }
56 ++__first; ++__pos;
58 --- misc/STLport-4.5/stlport/stl/_tree.c 2009-03-22 17:04:36.000000000 +0100
59 +++ misc/build/STLport-4.5/stlport/stl/_tree.c 2009-03-22 17:26:32.000000000 +0100
60 @@ -186,18 +186,20 @@
61 __z->_M_parent->_M_left = __x;
62 else
63 __z->_M_parent->_M_right = __x;
64 - if (__leftmost == __z)
65 + if (__leftmost == __z) {
66 if (__z->_M_right == 0) // __z->_M_left must be null also
67 __leftmost = __z->_M_parent;
68 // makes __leftmost == _M_header if __z == __root
69 else
70 __leftmost = _Rb_tree_node_base::_S_minimum(__x);
71 - if (__rightmost == __z)
72 + }
73 + if (__rightmost == __z) {
74 if (__z->_M_left == 0) // __z->_M_right must be null also
75 __rightmost = __z->_M_parent;
76 // makes __rightmost == _M_header if __z == __root
77 else // __x == __z->_M_left
78 __rightmost = _Rb_tree_node_base::_S_maximum(__x);
79 + }
81 if (__y->_M_color != _S_rb_tree_red) {
82 while (__x != __root && (__x == 0 || __x->_M_color == _S_rb_tree_black))
83 --- misc/STLport-4.5/stlport/stl/debug/_debug.c 2001-05-30 05:45:43.000000000 +0200
84 +++ misc/build/STLport-4.5/stlport/stl/debug/_debug.c 2009-03-22 17:26:32.000000000 +0100
85 @@ -58,7 +58,7 @@
86 # endif
87 const _Iterator& __last, const forward_iterator_tag &) {
88 _Iterator1 __i(__first);
89 - for (; __i != __last && __i != __it; ++__i);
90 + for (; __i != __last && __i != __it; ++__i) ;
91 return (__i!=__last);
94 @@ -68,7 +68,7 @@
95 __in_range_aux(const _Iterator1& __it, const _Iterator& __first,
96 const _Iterator& __last, const bidirectional_iterator_tag &) {
97 _Iterator1 __i(__first);
98 - for (; __i != __last && __i != __it; ++__i);
99 + for (; __i != __last && __i != __it; ++__i) ;
100 return (__i !=__last);
102 # endif
103 --- misc/STLport-4.5/stlport/stl/debug/_list.h 2001-05-30 05:45:43.000000000 +0200
104 +++ misc/build/STLport-4.5/stlport/stl/debug/_list.h 2009-03-22 17:26:32.000000000 +0100
105 @@ -209,7 +209,7 @@
106 void resize(size_type __new_size, const _Tp& __x) {
107 typename _Base::iterator __i = _Base::begin();
108 size_type __len = 0;
109 - for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len);
110 + for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len) ;
112 if (__len == __new_size)
113 erase(iterator(&_M_iter_list,__i), end());