mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb41 (1.8.10); FILE MERGED

Browse Source 
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.
This commit is contained in:
Rüdiger Timm
2006-01-10 14:46:47 +00:00
parent 6ccc5b9b3a
commit 70e0d26d23
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
codemaker/source/cppumaker/cpputype.hxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: cpputype.hxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -130,6 +130,16 @@ protected:
virtual void addComprehensiveGetCppuTypeIncludes( virtual void addComprehensiveGetCppuTypeIncludes(
codemaker::cppumaker::Includes & includes) const; 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 addDefaultHIncludes(codemaker::cppumaker::Includes & includes) const;
void addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes) const; void addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes) const;
@@ -141,7 +151,6 @@ protected:
sal_Bool m_cppuTypeLeak; sal_Bool m_cppuTypeLeak;
sal_Bool m_cppuTypeDynamic; sal_Bool m_cppuTypeDynamic;
sal_Bool m_cppuTypeStatic;
sal_uInt32 m_indentLength; sal_uInt32 m_indentLength;
::rtl::OString m_typeName; ::rtl::OString m_typeName;
::rtl::OString m_name; ::rtl::OString m_name;
@@ -275,16 +284,11 @@ protected:
virtual void addComprehensiveGetCppuTypeIncludes( virtual void addComprehensiveGetCppuTypeIncludes(
codemaker::cppumaker::Includes & includes) const; codemaker::cppumaker::Includes & includes) const;
private: virtual bool isPolymorphic() const;
bool isPolymorphic() const;
void dumpTemplateHead(FileStream & out) const; virtual void dumpTemplateHead(FileStream & out) const;
void dumpTemplateParameters(FileStream & out) const; virtual void dumpTemplateParameters(FileStream & out) const;
void dumpGetCppuTypePreamble(FileStream & out);
void dumpGetCppuTypePostamble(FileStream & out);
}; };
class ExceptionType : public CppuType class ExceptionType : public CppuType