summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-03-07 12:12:53 +0000
committerOliver Bolte <obo@openoffice.org>2007-03-07 12:12:53 +0000
commit1139bfac911e54e1bca84237dd633b4f17264c9c (patch)
treec490d35d077a35b26a63447d21fca94e420c6a19 /stlport
parent9369090b3d379d0f8c63eeae6c3136f78ae578b0 (diff)
INTEGRATION: CWS pj73 (1.9.14); FILE MERGED
2007/03/05 08:34:17 pjanik 1.9.14.2: #i75098#: Prevent warnings on Mac OS X. 2007/02/26 11:58:58 pjanik 1.9.14.1: #i74805#: Initialize variable to prevent warnings when compiled with --enable-dbgutil.
Diffstat (limited to 'stlport')
-rw-r--r--stlport/STLport-4.5-macxp-panther.patch33
1 files changed, 32 insertions, 1 deletions
diff --git a/stlport/STLport-4.5-macxp-panther.patch b/stlport/STLport-4.5-macxp-panther.patch
index a863c3b3842f..5578173c1443 100644
--- a/stlport/STLport-4.5-macxp-panther.patch
+++ b/stlport/STLport-4.5-macxp-panther.patch
@@ -422,8 +422,39 @@
}
// ----------------------------------------------------------------------
+*** misc/STLport-4.5/stlport/stl/_list.h Wed May 30 05:45:41 2001
+--- misc/build/STLport-4.5/stlport/stl/_list.h Sun Mar 4 16:42:45 2007
+***************
+*** 87,93 ****
+ _List_node_base* _M_node;
+
+ _List_iterator_base(_List_node_base* __x) : _M_node(__x) {}
+! _List_iterator_base() {}
+
+ void _M_incr() { _M_node = _M_node->_M_next; }
+ void _M_decr() { _M_node = _M_node->_M_prev; }
+--- 87,93 ----
+ _List_node_base* _M_node;
+
+ _List_iterator_base(_List_node_base* __x) : _M_node(__x) {}
+! _List_iterator_base() : _M_node(NULL) {}
+
+ void _M_incr() { _M_node = _M_node->_M_next; }
+ void _M_decr() { _M_node = _M_node->_M_prev; }
+*** misc/STLport-4.5/stlport/stl/_tempbuf.h Wed May 30 05:45:42 2001
+--- misc/build/STLport-4.5/stlport/stl/_tempbuf.h Sun Mar 4 16:41:59 2007
+***************
+*** 113,118 ****
+--- 113,119 ----
+ # else
+ typedef typename __type_traits<_Tp>::has_trivial_default_constructor _Trivial;
+ # endif
++ _M_buffer = 0;
+ _STLP_TRY {
+ _M_len = distance(__first, __last);
+ _M_allocate_buffer();
*** misc/STLport-4.5/stlport/stl/_threads.h Tue Sep 4 19:10:20 2001
---- misc/build/STLport-4.5/stlport/stl/_threads.h Sun Sep 17 09:25:58 2006
+--- misc/build/STLport-4.5/stlport/stl/_threads.h Mon Feb 26 12:15:24 2007
***************
*** 42,49 ****
# include <cstdlib>