diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:46:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:46:47 +0000 |
| commit | 70e0d26d23645b46cac25e4cfffb056bded7456c (patch) | |
| tree | eeb786b2783c025e69c7626a97254e2078f49598 /codemaker | |
| parent | 6ccc5b9b3abbce93a83e99f1ecd2b1b0b70b7f35 (diff) | |
INTEGRATION: CWS sb41 (1.8.10); FILE MERGED
2005/11/24 08:21:09 sb 1.8.10.1: #i57855# Replaced getCppuType (which is still there for backwards compatibility) with new cppu::UnoType and helper cppu::getTypeFavourUnsigned, as GCC 4.1 started to complain about non-conforming uses of getCppuType in template code.
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/source/cppumaker/cpputype.hxx | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx index 635b0be6d6c8..b3b0fa8812ee 100644 --- a/codemaker/source/cppumaker/cpputype.hxx +++ b/codemaker/source/cppumaker/cpputype.hxx @@ -4,9 +4,9 @@ * * $RCSfile: cpputype.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-08 02:12:40 $ + * last change: $Author: rt $ $Date: 2006-01-10 15:46:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -130,6 +130,16 @@ protected: virtual void addComprehensiveGetCppuTypeIncludes( codemaker::cppumaker::Includes & includes) const; + virtual bool isPolymorphic() const; + + virtual void dumpTemplateHead(FileStream & out) const; + + virtual void dumpTemplateParameters(FileStream & out) const; + + void dumpGetCppuTypePreamble(FileStream & out); + + void dumpGetCppuTypePostamble(FileStream & out); + void addDefaultHIncludes(codemaker::cppumaker::Includes & includes) const; void addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes) const; @@ -141,7 +151,6 @@ protected: sal_Bool m_cppuTypeLeak; sal_Bool m_cppuTypeDynamic; - sal_Bool m_cppuTypeStatic; sal_uInt32 m_indentLength; ::rtl::OString m_typeName; ::rtl::OString m_name; @@ -275,16 +284,11 @@ protected: virtual void addComprehensiveGetCppuTypeIncludes( codemaker::cppumaker::Includes & includes) const; -private: - bool isPolymorphic() const; - - void dumpTemplateHead(FileStream & out) const; + virtual bool isPolymorphic() const; - void dumpTemplateParameters(FileStream & out) const; + virtual void dumpTemplateHead(FileStream & out) const; - void dumpGetCppuTypePreamble(FileStream & out); - - void dumpGetCppuTypePostamble(FileStream & out); + virtual void dumpTemplateParameters(FileStream & out) const; }; class ExceptionType : public CppuType |