Attachment #336 for issue #1129

View | Details | Raw Unified | Return to issue 1129
Collapse All | Expand All

Lines 62-68 Link Here

(-)codemaker/inc/codemaker/dependency.hxx (+4 lines)
62	#ifndef _CODEMAKER_DEPENDENCY_HXX_	62	#ifndef _CODEMAKER_DEPENDENCY_HXX_
63	#define _CODEMAKER_DEPENDENCY_HXX_	63	#define _CODEMAKER_DEPENDENCY_HXX_
64		64
		65	#if ( __GNU_STL__ == 3 )
		66	#include <ext/hash_map>
		67	#else
65	#include <hash_map>	68	#include <hash_map>
		69	#endif
66		70
67	#ifndef _REGISTRY_REGISTRY_HXX_	71	#ifndef _REGISTRY_REGISTRY_HXX_
68	#include <registry/registry.hxx>	72	#include <registry/registry.hxx>

Lines 129-140 Link Here

(-)codemaker/inc/codemaker/global.hxx (+8 lines)
129	{	129	{
130	public:	130	public:
131	FileStream();	131	FileStream();
		132	#if ( __GNU_STL__ == 3 )
		133	FileStream(const ::rtl::OString& name, sal_Int32 nMode = std::ios::out \| std::ios::trunc);
		134	#else
132	FileStream(const ::rtl::OString& name, sal_Int32 nMode = ios::out \| ios::trunc);	135	FileStream(const ::rtl::OString& name, sal_Int32 nMode = ios::out \| ios::trunc);
		136	#endif
133	virtual ~FileStream();	137	virtual ~FileStream();
134		138
135	sal_Bool isValid();	139	sal_Bool isValid();
136		140
		141	#if ( __GNU_STL__ == 3 )
		142	void openFile(const ::rtl::OString& name, sal_Int32 nMode = std::ios::out \| std::ios::trunc);
		143	#else
137	void openFile(const ::rtl::OString& name, sal_Int32 nMode = ios::out \| ios::trunc);	144	void openFile(const ::rtl::OString& name, sal_Int32 nMode = ios::out \| ios::trunc);
		145	#endif
138	void closeFile();	146	void closeFile();
139		147
140	sal_Int32 getSize();	148	sal_Int32 getSize();

Lines 62-68 Link Here

(-)codemaker/inc/codemaker/options.hxx (+4 lines)
62	#ifndef _CODEMAKER_OPTIONS_HXX_	62	#ifndef _CODEMAKER_OPTIONS_HXX_
63	#define _CODEMAKER_OPTIONS_HXX_	63	#define _CODEMAKER_OPTIONS_HXX_
64		64
		65	#if ( __GNU_STL__ == 3 )
		66	#include <ext/hash_map>
		67	#else
65	#include <hash_map>	68	#include <hash_map>
		69	#endif
66		70
67	#ifndef _CODEMAKER_GLOBAL_HXX_	71	#ifndef _CODEMAKER_GLOBAL_HXX_
68	#include <codemaker/global.hxx>	72	#include <codemaker/global.hxx>

Lines 59-65 Link Here

(-)codemaker/inc/codemaker/typemanager.hxx (+4 lines)
59	*	59	*
60	************************************************************************/	60	************************************************************************/
61		61
		62	#if ( __GNU_STL__ == 3 )
		63	#include <ext/hash_map>
		64	#else
62	#include <hash_map>	65	#include <hash_map>
		66	#endif
63		67
64	#ifndef _CODEMAKER_TYPEMANAGER_HXX_	68	#ifndef _CODEMAKER_TYPEMANAGER_HXX_
65	#define _CODEMAKER_TYPEMANAGER_HXX_	69	#define _CODEMAKER_TYPEMANAGER_HXX_

Lines 75-81 Link Here

(-)codemaker/source/bonobowrappermaker/corbatype.cxx (+4 lines)
75	#include "corbatype.hxx"	75	#include "corbatype.hxx"
76	#include "corbaoptions.hxx"	76	#include "corbaoptions.hxx"
77		77
		78	#if ( __GNU_STL__ == 3 )
		79	#include <ext/hash_set>
		80	#else
78	#include <hash_set>	81	#include <hash_set>
		82	#endif
79	#include <list>	83	#include <list>
80		84
81	using namespace rtl;	85	using namespace rtl;

Lines 70-76 Link Here

(-)codemaker/source/bonobowrappermaker/corbatype.hxx (+4 lines)
70	#include <codemaker/dependency.hxx>	70	#include <codemaker/dependency.hxx>
71	#endif	71	#endif
72		72
		73	#if ( __GNU_STL__ == 3 )
		74	#include <ext/hash_set>
		75	#else
73	#include <hash_set>	76	#include <hash_set>
		77	#endif
74		78
75	enum BASETYPE	79	enum BASETYPE
76	{	80	{

Lines 325-331 Link Here

(-)codemaker/source/codemaker/global.cxx (-1 / +9 lines)
325	}	325	}
326		326
327	FileStream::FileStream(const OString& name, sal_Int32 nMode)	327	FileStream::FileStream(const OString& name, sal_Int32 nMode)
		328	#if ( __GNU_STL__ == 3 )
		329	: ofstream(name, (std::_Ios_Openmode) nMode)
		330	#else
328	: ofstream(name, nMode)	331	: ofstream(name, nMode)
		332	#endif
329	, m_name(name)	333	, m_name(name)
330	{	334	{
331	}	335	}
Lines 339-345 Link Here
339	sal_Bool FileStream::isValid()	343	sal_Bool FileStream::isValid()
340	{	344	{
341	#if defined(SAL_UNX) \|\| defined(SAL_OS2)	345	#if defined(SAL_UNX) \|\| defined(SAL_OS2)
342	#if STLPORT_VERSION < 400	346	#if defined(STLPORT_VERSION) && STLPORT_VERSION < 400
343	if(rdbuf()->fd() < 0)	347	if(rdbuf()->fd() < 0)
344	#else	348	#else
345	if( !is_open() )	349	if( !is_open() )
Lines 360-366 Link Here
360	m_name = name;	364	m_name = name;
361		365
362	if ( m_name.getLength() > 0 )	366	if ( m_name.getLength() > 0 )
		367	#if ( __GNU_STL__ == 3 )
		368	open(m_name, (std::_Ios_Openmode) nMode);
		369	#else
363	open(m_name, nMode);	370	open(m_name, nMode);
		371	#endif
364	}	372	}
365		373
366	void FileStream::closeFile()	374	void FileStream::closeFile()

Lines 76-81 Link Here

(-)codemaker/source/cppumaker/cpputype.cxx (+1 lines)
76	#include "cppuoptions.hxx"	76	#include "cppuoptions.hxx"
77		77
78	using namespace rtl;	78	using namespace rtl;
		79	using namespace std;
79		80
80	//*************************************************************************	81	//*************************************************************************
81	// CppuType	82	// CppuType

Return to issue 1129