Attachment #352 for issue #1129

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

Lines 62-68 Link Here

(-)rdbmaker/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 72-77 Link Here

(-)rdbmaker/inc/codemaker/global.hxx (+2 lines)
72	#include <rtl/ustring.hxx>	72	#include <rtl/ustring.hxx>
73	#endif	73	#endif
74		74
		75	using namespace std;
		76
75	struct EqualString	77	struct EqualString
76	{	78	{
77	sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const	79	sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const

Lines 62-68 Link Here

(-)rdbmaker/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

(-)rdbmaker/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 320-326 Link Here

(-)rdbmaker/source/codemaker/global.cxx (-1 / +9 lines)
320	}	320	}
321		321
322	FileStream::FileStream(const OString& name, sal_Int32 nMode)	322	FileStream::FileStream(const OString& name, sal_Int32 nMode)
		323	#if ( __GNU_STL__ == 3 )
		324	: ofstream(name, (std::_Ios_Openmode) nMode)
		325	#else
323	: ofstream(name, nMode)	326	: ofstream(name, nMode)
		327	#endif
324	, m_name(name)	328	, m_name(name)
325	{	329	{
326	}	330	}
Lines 334-340 Link Here
334	sal_Bool FileStream::isValid()	338	sal_Bool FileStream::isValid()
335	{	339	{
336	#if defined(SAL_UNX) \|\| defined(SAL_OS2)	340	#if defined(SAL_UNX) \|\| defined(SAL_OS2)
337	#if STLPORT_VERSION < 400	341	#if defined(STLPORT_VERSION) && (STLPORT_VERSION < 400)
338	if(rdbuf()->fd() < 0)	342	if(rdbuf()->fd() < 0)
339	#else	343	#else
340	if( !is_open() )	344	if( !is_open() )
Lines 355-361 Link Here
355	m_name = name;	359	m_name = name;
356		360
357	if ( m_name.getLength() > 0 )	361	if ( m_name.getLength() > 0 )
		362	#if ( __GNU_STL__ == 3 )
		363	open(m_name, (std::_Ios_Openmode) nMode);
		364	#else
358	open(m_name, nMode);	365	open(m_name, nMode);
		366	#endif
359	}	367	}
360		368
361	void FileStream::closeFile()	369	void FileStream::closeFile()

Lines 59-65 Link Here

(-)rdbmaker/source/rdbmaker/specialtypemanager.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 _SPECIALTYPEMANAGER_HXX_	68	#ifndef _SPECIALTYPEMANAGER_HXX_
65	#define _SPECIALTYPEMANAGER_HXX_	69	#define _SPECIALTYPEMANAGER_HXX_

Return to issue 1129