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

INTEGRATION: CWS sb41 (1.3.12); FILE MERGED

Browse Source 
2005/11/24 08:21:09 sb 1.3.12.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:47:12 +00:00
parent 70e0d26d23
commit 22a36fdb5c
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
codemaker/source/cppumaker/includes.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: includes.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2005-09-08 02:13:24 $
* last change: $Author: rt $ $Date: 2006-01-10 15:46:59 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -58,10 +58,11 @@ Includes::Includes(
m_includeAny(dependencies.hasAnyDependency()), m_includeReference(false),
m_includeSequence(dependencies.hasSequenceDependency()),
m_includeType(dependencies.hasTypeDependency()),
m_includeCppuMacrosHxx(false), m_includeOslDoublecheckedlockingH(false),
m_includeOslMutexHxx(false), m_includeRtlStrbufHxx(false),
m_includeRtlStringH(false), m_includeRtlTextencH(false),
m_includeRtlUstrbufHxx(false), m_includeRtlUstringH(false),
m_includeCppuMacrosHxx(false), m_includeCppuUnotypeHxx(false),
m_includeOslDoublecheckedlockingH(false), m_includeOslMutexHxx(false),
m_includeRtlStrbufHxx(false), m_includeRtlStringH(false),
m_includeRtlTextencH(false), m_includeRtlUstrbufHxx(false),
m_includeRtlUstringH(false),
m_includeRtlUstringHxx(dependencies.hasStringDependency()),
m_includeSalTypesH(
dependencies.hasBooleanDependency() || dependencies.hasByteDependency()
@@ -228,6 +229,11 @@ void Includes::dump(FileStream & out, rtl::OString const * companionHdl) {
out << ("#ifndef _CPPU_MACROS_HXX_\n"
"#include \"cppu/macros.hxx\"\n#endif\n");
}
if (m_includeCppuUnotypeHxx) {
dumpEmptyLineBeforeFirst(out, &first);
out << ("#ifndef INCLUDED_CPPU_UNOTYPE_HXX\n"
"#include \"cppu/unotype.hxx\"\n#endif\n");
}
if (m_includeOslDoublecheckedlockingH) {
dumpEmptyLineBeforeFirst(out, &first);
out << ("#ifndef INCLUDED_OSL_DOUBLECHECKEDLOCKING_H\n"

7
codemaker/source/cppumaker/includes.hxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: includes.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2005-09-08 02:13:38 $
* last change: $Author: rt $ $Date: 2006-01-10 15:47:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -65,6 +65,8 @@ public:
void addCppuMacrosHxx() { m_includeCppuMacrosHxx = true; }
void addCppuUnotypeHxx() { m_includeCppuUnotypeHxx = true; }
void addOslDoublecheckedlockingH()
{ m_includeOslDoublecheckedlockingH = true; }
@@ -109,6 +111,7 @@ private:
bool m_includeSequence;
bool m_includeType;
bool m_includeCppuMacrosHxx;
bool m_includeCppuUnotypeHxx;
bool m_includeOslDoublecheckedlockingH;
bool m_includeOslMutexHxx;
bool m_includeRtlStrbufHxx;