You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2011/08/29 01:23:03 UTC
svn commit: r1162609 - in /incubator/ooo/trunk/main: autodoc/inc/ary/idl/
basegfx/source/polygon/ chart2/source/controller/main/
dbaccess/source/core/dataaccess/ hwpfilter/source/ libwpd/ moz/
moz/patches/ sc/source/filter/inc/
Author: mst
Date: Sun Aug 28 23:23:03 2011
New Revision: 1162609
URL: http://svn.apache.org/viewvc?rev=1162609&view=rev
Log:
fix up code so it builds with GCC 4.6:
put user-defined default constructors in some classes.
remove "mutable" from reference variables.
include stddef.h where size_t or ptrdiff_t was not defined.
Added:
incubator/ooo/trunk/main/libwpd/libwpd-0.8.8-gcc46.patch (with props)
incubator/ooo/trunk/main/moz/patches/gcc46.patch (with props)
Modified:
incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx
incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolygon.cxx
incubator/ooo/trunk/main/chart2/source/controller/main/ChartController.hxx
incubator/ooo/trunk/main/dbaccess/source/core/dataaccess/documentdefinition.hxx
incubator/ooo/trunk/main/hwpfilter/source/list.hxx
incubator/ooo/trunk/main/libwpd/makefile.mk
incubator/ooo/trunk/main/moz/makefile.mk
incubator/ooo/trunk/main/sc/source/filter/inc/xeroot.hxx
incubator/ooo/trunk/main/sc/source/filter/inc/xiroot.hxx
incubator/ooo/trunk/main/sc/source/filter/inc/xlroot.hxx
Modified: incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx (original)
+++ incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx Sun Aug 28 23:23:03 2011
@@ -50,6 +50,7 @@ class Ce_2s
{
public:
// LIFECYCLE
+ explicit Ce_2s () { }
virtual ~Ce_2s();
static DYN Ce_2s * Create_(
Modified: incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolygon.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolygon.cxx?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolygon.cxx (original)
+++ incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolygon.cxx Sun Aug 28 23:23:03 2011
@@ -256,6 +256,8 @@ class ControlVectorPair2D
basegfx::B2DVector maNextVector;
public:
+ explicit ControlVectorPair2D () { }
+
const basegfx::B2DVector& getPrevVector() const
{
return maPrevVector;
Modified: incubator/ooo/trunk/main/chart2/source/controller/main/ChartController.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/chart2/source/controller/main/ChartController.hxx?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/chart2/source/controller/main/ChartController.hxx (original)
+++ incubator/ooo/trunk/main/chart2/source/controller/main/ChartController.hxx Sun Aug 28 23:23:03 2011
@@ -546,7 +546,7 @@ private:
TheModel* operator->() const { return m_pTheModel; }
private:
TheModel* m_pTheModel;
- mutable ::osl::Mutex& m_rModelMutex;
+ ::osl::Mutex& m_rModelMutex;
};
private:
Modified: incubator/ooo/trunk/main/dbaccess/source/core/dataaccess/documentdefinition.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dbaccess/source/core/dataaccess/documentdefinition.hxx?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dbaccess/source/core/dataaccess/documentdefinition.hxx (original)
+++ incubator/ooo/trunk/main/dbaccess/source/core/dataaccess/documentdefinition.hxx Sun Aug 28 23:23:03 2011
@@ -397,7 +397,7 @@ private:
ODocumentDefinition& m_rDocumentDefinition;
const ::com::sun::star::uno::Any m_aOldValue;
const ::com::sun::star::uno::Any m_aNewValue;
- mutable ::osl::ResettableMutexGuard& m_rClearForNotify;
+ ::osl::ResettableMutexGuard& m_rClearForNotify;
void impl_fireEvent_throw( const sal_Bool i_bVetoable );
};
Modified: incubator/ooo/trunk/main/hwpfilter/source/list.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/hwpfilter/source/list.hxx?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/hwpfilter/source/list.hxx (original)
+++ incubator/ooo/trunk/main/hwpfilter/source/list.hxx Sun Aug 28 23:23:03 2011
@@ -50,7 +50,7 @@ class LinkedList
public:
/// construct list with one element (pItem) or no element (pItem == NULL)
- LinkedList( T* pItem = NULL );
+ LinkedList( T* pItem = 0 );
~LinkedList();
T* find( const int n ); /// return nth element in list
@@ -82,7 +82,7 @@ class LinkedListIterator
public:
/// construct list with single element
- LinkedListIterator( LinkedList<T>* pList = NULL );
+ LinkedListIterator( LinkedList<T>* pList = 0 );
~LinkedListIterator();
T* current(); /// return current element, or NULL if invalid
Added: incubator/ooo/trunk/main/libwpd/libwpd-0.8.8-gcc46.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libwpd/libwpd-0.8.8-gcc46.patch?rev=1162609&view=auto
==============================================================================
--- incubator/ooo/trunk/main/libwpd/libwpd-0.8.8-gcc46.patch (added)
+++ incubator/ooo/trunk/main/libwpd/libwpd-0.8.8-gcc46.patch Sun Aug 28 23:23:03 2011
@@ -0,0 +1,11 @@
+--- misc/libwpd-0.8.8/src/lib/WPXTable.h 2007-01-03 14:07:56.000000000 +0100
++++ misc/build/libwpd-0.8.8/src/lib/WPXTable.h 2011-06-18 23:32:22.000000000 +0200
+@@ -34,6 +34,8 @@
+
+ #ifndef _WPXTABLE_H
+ #define _WPXTABLE_H
++
++#include <stddef.h>
+ #include <vector>
+ #include "libwpd_types.h"
+
Propchange: incubator/ooo/trunk/main/libwpd/libwpd-0.8.8-gcc46.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ooo/trunk/main/libwpd/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libwpd/makefile.mk?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/libwpd/makefile.mk (original)
+++ incubator/ooo/trunk/main/libwpd/makefile.mk Sun Aug 28 23:23:03 2011
@@ -45,7 +45,7 @@ TARGET=wpd
TARFILE_NAME=libwpd-0.8.8
TARFILE_MD5=cd5997284f4ba1e8dde5d1e5869fc342
-PATCH_FILES=$(TARFILE_NAME).diff
+PATCH_FILES=$(TARFILE_NAME)-gcc46.patch $(TARFILE_NAME).diff
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
Modified: incubator/ooo/trunk/main/moz/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/makefile.mk?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/moz/makefile.mk (original)
+++ incubator/ooo/trunk/main/moz/makefile.mk Sun Aug 28 23:23:03 2011
@@ -83,6 +83,7 @@ TARFILE_MD5=a169ab152209200a7bad29a275cb
TARFILE_ROOTDIR=mozilla
PATCH_FILES = \
seamonkey-source-$(MOZILLA_VERSION).patch \
+ patches/gcc46.patch \
patches/dtoa.patch \
patches/respect_disable_pango.patch \
patches/arm_build_fix.patch \
Added: incubator/ooo/trunk/main/moz/patches/gcc46.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/patches/gcc46.patch?rev=1162609&view=auto
==============================================================================
--- incubator/ooo/trunk/main/moz/patches/gcc46.patch (added)
+++ incubator/ooo/trunk/main/moz/patches/gcc46.patch Sun Aug 28 23:23:03 2011
@@ -0,0 +1,10 @@
+--- misc/mozilla/intl/unicharutil/util/nsUnicharUtils.h 2008-08-30 01:14:52.000000000 +0200
++++ misc/build/mozilla/intl/unicharutil/util/nsUnicharUtils.h 2011-06-18 23:51:31.000000000 +0200
+@@ -64,6 +64,7 @@
+ : public nsStringComparator
+ {
+ public:
++ nsCaseInsensitiveStringComparator() { }
+ virtual int operator()( const PRUnichar*, const PRUnichar*, PRUint32 aLength ) const;
+ virtual int operator()( PRUnichar, PRUnichar ) const;
+ };
Propchange: incubator/ooo/trunk/main/moz/patches/gcc46.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ooo/trunk/main/sc/source/filter/inc/xeroot.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/filter/inc/xeroot.hxx?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/filter/inc/xeroot.hxx (original)
+++ incubator/ooo/trunk/main/sc/source/filter/inc/xeroot.hxx Sun Aug 28 23:23:03 2011
@@ -170,7 +170,7 @@ private:
XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const;
private:
- mutable XclExpRootData& mrExpData; /// Reference to the global export data struct.
+ XclExpRootData& mrExpData; /// Reference to the global export data struct.
};
// ============================================================================
Modified: incubator/ooo/trunk/main/sc/source/filter/inc/xiroot.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/filter/inc/xiroot.hxx?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/filter/inc/xiroot.hxx (original)
+++ incubator/ooo/trunk/main/sc/source/filter/inc/xiroot.hxx Sun Aug 28 23:23:03 2011
@@ -211,7 +211,7 @@ public:
void ReadCodeName( XclImpStream& rStrm, bool bGlobals );
private:
- mutable XclImpRootData& mrImpData; /// Reference to the global import data struct.
+ XclImpRootData& mrImpData; /// Reference to the global import data struct.
};
// ============================================================================
Modified: incubator/ooo/trunk/main/sc/source/filter/inc/xlroot.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/filter/inc/xlroot.hxx?rev=1162609&r1=1162608&r2=1162609&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/filter/inc/xlroot.hxx (original)
+++ incubator/ooo/trunk/main/sc/source/filter/inc/xlroot.hxx Sun Aug 28 23:23:03 2011
@@ -285,7 +285,7 @@ public:
inline void IncCurrScTab() { ++mrData.mnScTab; }
private:
- mutable XclRootData& mrData; /// Reference to the global data struct.
+ XclRootData& mrData; /// Reference to the global data struct.
};
// ============================================================================
Re: svn commit: r1162609 - in /incubator/ooo/trunk/main: autodoc/inc/ary/idl/
basegfx/source/polygon/ chart2/source/controller/main/ dbaccess/source/core/dataaccess/
hwpfilter/source/ libwpd/ moz/ moz/patches/ sc/source/filter/inc/
Posted by Michael Stahl <ms...@openoffice.org>.
On 29.08.2011 02:27, Eike Rathke wrote:
> Hi Michael,
>
> On Sunday, 2011-08-28 23:23:03 -0000, mst@apache.org wrote:
>
>> URL: http://svn.apache.org/viewvc?rev=1162609&view=rev
>
>> --- incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx (original)
>> +++ incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx Sun Aug 28 23:23:03 2011
>> @@ -50,6 +50,7 @@ class Ce_2s
>> {
>> public:
>> // LIFECYCLE
>> + explicit Ce_2s () { }
>> virtual ~Ce_2s();
>>
>> static DYN Ce_2s * Create_(
>
> I took a different approach without introducing that ctor:
> https://svn.apache.org/viewvc/incubator/ooo/trunk/main/autodoc/source/ary/idl/i_ce.cxx?r1=1162288&r2=1162554&pathrev=1162554&diff_format=h
>
> IMHO holding a const dummy just to be able to return a const reference
> if the factory didn't yet create an instance is nonsense.
indeed you are right; i just failed to remove this from the patch that i
had laying around for weeks (and i had not actually looked at the use
site back then which indeed was nonsense).
Re: svn commit: r1162609 - in /incubator/ooo/trunk/main:
autodoc/inc/ary/idl/ basegfx/source/polygon/ chart2/source/controller/main/
dbaccess/source/core/dataaccess/ hwpfilter/source/ libwpd/ moz/ moz/patches/
sc/source/filter/inc/
Posted by Eike Rathke <oo...@erack.de>.
Hi Michael,
On Sunday, 2011-08-28 23:23:03 -0000, mst@apache.org wrote:
> URL: http://svn.apache.org/viewvc?rev=1162609&view=rev
> --- incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx (original)
> +++ incubator/ooo/trunk/main/autodoc/inc/ary/idl/i_ce2s.hxx Sun Aug 28 23:23:03 2011
> @@ -50,6 +50,7 @@ class Ce_2s
> {
> public:
> // LIFECYCLE
> + explicit Ce_2s () { }
> virtual ~Ce_2s();
>
> static DYN Ce_2s * Create_(
I took a different approach without introducing that ctor:
https://svn.apache.org/viewvc/incubator/ooo/trunk/main/autodoc/source/ary/idl/i_ce.cxx?r1=1162288&r2=1162554&pathrev=1162554&diff_format=h
IMHO holding a const dummy just to be able to return a const reference
if the factory didn't yet create an instance is nonsense.
> --- incubator/ooo/trunk/main/hwpfilter/source/list.hxx (original)
> +++ incubator/ooo/trunk/main/hwpfilter/source/list.hxx Sun Aug 28 23:23:03 2011
> @@ -50,7 +50,7 @@ class LinkedList
>
> public:
> /// construct list with one element (pItem) or no element (pItem == NULL)
> - LinkedList( T* pItem = NULL );
> + LinkedList( T* pItem = 0 );
Well, yes, or #include <cstddef> instead, which I did.
Eike
--
PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication.
Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD