diff options
| author | Eike Rathke <erack@apache.org> | 2011-08-28 15:51:19 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@apache.org> | 2011-08-28 15:51:19 +0000 |
| commit | 66b361bdd52f9aa8ddbdfe4b9c248000e8a2460f (patch) | |
| tree | d37b4f349840ec128e804036df9fc6f1bbe22112 /autodoc | |
| parent | cc756d24d3f34c4ac402ee88ed3e25e3934ec8bc (diff) | |
fix build breakers unxlngx6.pro gcc 4.6.1 (Debian wheezy amd64)
Builds up to but not including offapi.
Diffstat (limited to 'autodoc')
| -rw-r--r-- | autodoc/source/ary/idl/i_ce.cxx | 9 | ||||
| -rw-r--r-- | autodoc/source/display/idl/hi_linkhelper.hxx | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/autodoc/source/ary/idl/i_ce.cxx b/autodoc/source/ary/idl/i_ce.cxx index 783e3a9b93f7..874929d8a3a5 100644 --- a/autodoc/source/ary/idl/i_ce.cxx +++ b/autodoc/source/ary/idl/i_ce.cxx @@ -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 & diff --git a/autodoc/source/display/idl/hi_linkhelper.hxx b/autodoc/source/display/idl/hi_linkhelper.hxx index 26f50cca2f87..e6b9eff65f11 100644 --- a/autodoc/source/display/idl/hi_linkhelper.hxx +++ b/autodoc/source/display/idl/hi_linkhelper.hxx @@ -85,8 +85,7 @@ class LinkHelper private: // DATA - mutable HtmlEnvironment_Idl & - rEnv; + HtmlEnvironment_Idl & rEnv; }; inline const ary::idl::CodeEntity * |