ooo-build r13888 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri Sep 12 15:07:56 2008
New Revision: 13888
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13888&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/o3tl-fix-warnings.diff: annoyed by the warning
    spew from cow_wrapper.hxx, grabbed Caolan's fix for that.



Added:
   trunk/patches/dev300/o3tl-fix-warnings.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Sep 12 15:07:56 2008
@@ -2617,6 +2617,7 @@
 jurt-jnilib-deliver.diff, i#93516, thorsten
 solenv-silent-mac-build.diff, thorsten
 ppt-continuous-numbering-fix.diff, n#411565, thorsten
+o3tl-fix-warnings.diff, i#92941, cmc
 
 [ ImpressFontSize ]
 [ Fixes <= dev300-m30 <= ooo300-m3 ]

Added: trunk/patches/dev300/o3tl-fix-warnings.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/o3tl-fix-warnings.diff	Fri Sep 12 15:07:56 2008
@@ -0,0 +1,24 @@
+--- o3tl/inc/o3tl/cow_wrapper.hxx	11 Apr 2008 11:54:52 -0000	1.6
++++ o3tl/inc/o3tl/cow_wrapper.hxx	20 Aug 2008 12:19:49 -0000	1.6.10.1
+@@ -205,6 +205,7 @@ void cow_wrapper_client::queryUnmodified
+     public:
+         typedef T        value_type;
+         typedef T*       pointer;
++        typedef const T* const_pointer;
+         typedef MTPolicy mt_policy;
+ 
+         /** Default-construct wrapped type instance
+@@ -278,11 +279,11 @@ void cow_wrapper_client::queryUnmodified
+         
+         pointer		      operator->()       { return &make_unique(); }
+         value_type&       operator*()        { return make_unique(); }
+-        const pointer     operator->() const { return &m_pimpl->m_value; }
++        const_pointer     operator->() const { return &m_pimpl->m_value; }
+         const value_type& operator*()  const { return m_pimpl->m_value; }
+ 
+         pointer           get()       { return &make_unique(); }
+-        const pointer	  get() const { return &m_pimpl->m_value; }
++        const_pointer	  get() const { return &m_pimpl->m_value; }
+ 
+         /// true, if both cow_wrapper internally share the same object
+         bool              same_object( const cow_wrapper& rOther ) const