diff options
author | Michael Stahl <mst@apache.org> | 2011-08-28 22:23:03 +0000 |
---|---|---|
committer | Michael Stahl <mst@apache.org> | 2011-08-28 22:23:03 +0000 |
commit | 79fbe8110d9869c400775f6d81e413bacb6bdb9b (patch) | |
tree | 0354bfe03fe327c583b5c50d8df9c6c835a097ae | |
parent | b63dec716d1ccb1eb9357ad35815be02a0e3bfe7 (diff) |
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.
-rw-r--r-- | autodoc/inc/ary/idl/i_ce2s.hxx | 1 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dpolygon.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/main/ChartController.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/documentdefinition.hxx | 2 | ||||
-rw-r--r-- | hwpfilter/source/list.hxx | 4 | ||||
-rw-r--r-- | libwpd/libwpd-0.8.8-gcc46.patch | 11 | ||||
-rw-r--r-- | libwpd/makefile.mk | 2 | ||||
-rw-r--r-- | moz/makefile.mk | 1 | ||||
-rw-r--r-- | moz/patches/gcc46.patch | 10 | ||||
-rw-r--r-- | sc/source/filter/inc/xeroot.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xiroot.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xlroot.hxx | 2 |
12 files changed, 33 insertions, 8 deletions
diff --git a/autodoc/inc/ary/idl/i_ce2s.hxx b/autodoc/inc/ary/idl/i_ce2s.hxx index f3b3140f48c3..8071b6e4dbdb 100644 --- a/autodoc/inc/ary/idl/i_ce2s.hxx +++ b/autodoc/inc/ary/idl/i_ce2s.hxx @@ -50,6 +50,7 @@ class Ce_2s { public: // LIFECYCLE + explicit Ce_2s () { } virtual ~Ce_2s(); static DYN Ce_2s * Create_( diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx index d8255dc7ec10..97942f27db14 100644 --- a/basegfx/source/polygon/b2dpolygon.cxx +++ b/basegfx/source/polygon/b2dpolygon.cxx @@ -256,6 +256,8 @@ class ControlVectorPair2D basegfx::B2DVector maNextVector; public: + explicit ControlVectorPair2D () { } + const basegfx::B2DVector& getPrevVector() const { return maPrevVector; diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index f61dd48682e5..57a4675b5d88 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -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: diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index 76427ea78baf..438774c0cd03 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -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 ); }; diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx index 70677d6a4b31..7ba1a0a3761d 100644 --- a/hwpfilter/source/list.hxx +++ b/hwpfilter/source/list.hxx @@ -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 diff --git a/libwpd/libwpd-0.8.8-gcc46.patch b/libwpd/libwpd-0.8.8-gcc46.patch new file mode 100644 index 000000000000..c2be1261cea4 --- /dev/null +++ b/libwpd/libwpd-0.8.8-gcc46.patch @@ -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" + diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index 7576d5a60cb2..9048492b1c81 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -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 diff --git a/moz/makefile.mk b/moz/makefile.mk index feb2c50343ee..9237e69a4c91 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -83,6 +83,7 @@ TARFILE_MD5=a169ab152209200a7bad29a275cb0333 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 \ diff --git a/moz/patches/gcc46.patch b/moz/patches/gcc46.patch new file mode 100644 index 000000000000..86a46581c355 --- /dev/null +++ b/moz/patches/gcc46.patch @@ -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; + }; diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index ba51abdef1a2..40fcd743c31f 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -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. }; // ============================================================================ diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index c5cf284d2d2e..a895ede79669 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -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. }; // ============================================================================ diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index af42efcdb426..b507725e57bf 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -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. }; // ============================================================================ |