incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1162554 [1/3] - in /incubator/ooo/trunk/main: autodoc/source/ary/idl/i_ce.cxx autodoc/source/display/idl/hi_linkhelper.hxx cosv/inc/cosv/tpl/vvector.hxx graphite/graphite-2.3.1.patch readlicense_oo/html/THIRDPARTYLICENSEREADME.html
Date Sun, 28 Aug 2011 16:51:19 GMT
Author: erack
Date: Sun Aug 28 16:51:19 2011
New Revision: 1162554

URL: http://svn.apache.org/viewvc?rev=1162554&view=rev
Log:
fix build breakers unxlngx6.pro gcc 4.6.1 (Debian wheezy amd64)

Builds up to but not including offapi.

Added:
    incubator/ooo/trunk/main/graphite/graphite-2.3.1.patch
    incubator/ooo/trunk/main/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
Modified:
    incubator/ooo/trunk/main/autodoc/source/ary/idl/i_ce.cxx
    incubator/ooo/trunk/main/autodoc/source/display/idl/hi_linkhelper.hxx
    incubator/ooo/trunk/main/cosv/inc/cosv/tpl/vvector.hxx

Modified: incubator/ooo/trunk/main/autodoc/source/ary/idl/i_ce.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/autodoc/source/ary/idl/i_ce.cxx?rev=1162554&r1=1162553&r2=1162554&view=diff
==============================================================================
--- incubator/ooo/trunk/main/autodoc/source/ary/idl/i_ce.cxx (original)
+++ incubator/ooo/trunk/main/autodoc/source/ary/idl/i_ce.cxx Sun Aug 28 16:51:19 2011
@@ -39,11 +39,6 @@ namespace ary
 namespace idl
 {
 
-namespace
-{
-    const Ce_2s aConstCe2sDummy;
-}
-
 
 
 CodeEntity::CodeEntity()
@@ -59,9 +54,7 @@ CodeEntity::~CodeEntity()
 const Ce_2s &
 CodeEntity::Secondaries() const
 {
-    if (p2s)
-        return *p2s;
-    return aConstCe2sDummy;
+    return const_cast<CodeEntity*>(this)->Secondaries();
 }
 
 Ce_2s &

Modified: incubator/ooo/trunk/main/autodoc/source/display/idl/hi_linkhelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/autodoc/source/display/idl/hi_linkhelper.hxx?rev=1162554&r1=1162553&r2=1162554&view=diff
==============================================================================
--- incubator/ooo/trunk/main/autodoc/source/display/idl/hi_linkhelper.hxx (original)
+++ incubator/ooo/trunk/main/autodoc/source/display/idl/hi_linkhelper.hxx Sun Aug 28 16:51:19
2011
@@ -85,8 +85,7 @@ class LinkHelper
                           
   private:                                                     
     // DATA
-    mutable HtmlEnvironment_Idl &
-                        rEnv;
+    HtmlEnvironment_Idl & rEnv;
 };     
 
 inline const ary::idl::CodeEntity *          

Modified: incubator/ooo/trunk/main/cosv/inc/cosv/tpl/vvector.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cosv/inc/cosv/tpl/vvector.hxx?rev=1162554&r1=1162553&r2=1162554&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cosv/inc/cosv/tpl/vvector.hxx (original)
+++ incubator/ooo/trunk/main/cosv/inc/cosv/tpl/vvector.hxx Sun Aug 28 16:51:19 2011
@@ -28,6 +28,8 @@
 #ifndef CSV_VVECTOR_HXX
 #define CSV_VVECTOR_HXX
 
+#include <cstddef>      // for ptrdiff_t
+
 // USED SERVICES
 #include <vector>
 #include <cosv/tpl/tpltools.hxx>



Mime
View raw message