Index: codemaker/inc/codemaker/dependency.hxx
===================================================================
RCS file: /cvs/oo/udk/codemaker/inc/codemaker/dependency.hxx,v
retrieving revision 1.2
diff -u -r1.2 dependency.hxx
--- codemaker/inc/codemaker/dependency.hxx	2001/03/13 12:04:21	1.2
+++ codemaker/inc/codemaker/dependency.hxx	2001/07/03 05:34:35
@@ -62,7 +62,11 @@
 #ifndef _CODEMAKER_DEPENDENCY_HXX_
 #define _CODEMAKER_DEPENDENCY_HXX_
 
+#if ( __GNU_STL__ == 3 )
+#include <ext/hash_map>
+#else
 #include <hash_map>
+#endif
 
 #ifndef _REGISTRY_REGISTRY_HXX_
 #include <registry/registry.hxx>
Index: codemaker/inc/codemaker/global.hxx
===================================================================
RCS file: /cvs/oo/udk/codemaker/inc/codemaker/global.hxx,v
retrieving revision 1.2
diff -u -r1.2 global.hxx
--- codemaker/inc/codemaker/global.hxx	2001/03/13 12:04:21	1.2
+++ codemaker/inc/codemaker/global.hxx	2001/07/03 05:34:35
@@ -129,12 +129,20 @@
 {
 public:
 	FileStream();	
+#if ( __GNU_STL__ == 3 )
+	FileStream(const ::rtl::OString& name, sal_Int32 nMode = std::ios::out | std::ios::trunc);
+#else
 	FileStream(const ::rtl::OString& name, sal_Int32 nMode = ios::out | ios::trunc);	
+#endif
 	virtual ~FileStream();
 	
 	sal_Bool isValid();
 
+#if ( __GNU_STL__ == 3 )
+	void openFile(const ::rtl::OString& name, sal_Int32 nMode = std::ios::out | std::ios::trunc);
+#else
 	void openFile(const ::rtl::OString& name, sal_Int32 nMode = ios::out | ios::trunc);
+#endif
 	void closeFile();
 
 	sal_Int32 		getSize();
Index: codemaker/inc/codemaker/options.hxx
===================================================================
RCS file: /cvs/oo/udk/codemaker/inc/codemaker/options.hxx,v
retrieving revision 1.2
diff -u -r1.2 options.hxx
--- codemaker/inc/codemaker/options.hxx	2001/03/13 12:04:21	1.2
+++ codemaker/inc/codemaker/options.hxx	2001/07/03 05:34:35
@@ -62,7 +62,11 @@
 #ifndef _CODEMAKER_OPTIONS_HXX_
 #define _CODEMAKER_OPTIONS_HXX_
 
+#if ( __GNU_STL__ == 3 )
+#include <ext/hash_map>
+#else
 #include <hash_map>
+#endif
 
 #ifndef _CODEMAKER_GLOBAL_HXX_
 #include <codemaker/global.hxx>
Index: codemaker/inc/codemaker/typemanager.hxx
===================================================================
RCS file: /cvs/oo/udk/codemaker/inc/codemaker/typemanager.hxx,v
retrieving revision 1.3
diff -u -r1.3 typemanager.hxx
--- codemaker/inc/codemaker/typemanager.hxx	2001/03/13 12:04:21	1.3
+++ codemaker/inc/codemaker/typemanager.hxx	2001/07/03 05:34:36
@@ -59,7 +59,11 @@
  *
  ************************************************************************/
 
+#if ( __GNU_STL__ == 3 )
+#include <ext/hash_map>
+#else
 #include <hash_map>
+#endif
 
 #ifndef _CODEMAKER_TYPEMANAGER_HXX_
 #define _CODEMAKER_TYPEMANAGER_HXX_
Index: codemaker/source/bonobowrappermaker/corbatype.cxx
===================================================================
RCS file: /cvs/oo/udk/codemaker/source/bonobowrappermaker/corbatype.cxx,v
retrieving revision 1.3
diff -u -r1.3 corbatype.cxx
--- codemaker/source/bonobowrappermaker/corbatype.cxx	2001/04/11 07:27:38	1.3
+++ codemaker/source/bonobowrappermaker/corbatype.cxx	2001/07/03 05:34:42
@@ -75,7 +75,11 @@
 #include	"corbatype.hxx"
 #include	"corbaoptions.hxx"
 
+#if ( __GNU_STL__ == 3 )
+#include <ext/hash_set>
+#else
 #include <hash_set>
+#endif
 #include <list>
 
 using namespace rtl;
Index: codemaker/source/bonobowrappermaker/corbatype.hxx
===================================================================
RCS file: /cvs/oo/udk/codemaker/source/bonobowrappermaker/corbatype.hxx,v
retrieving revision 1.1
diff -u -r1.1 corbatype.hxx
--- codemaker/source/bonobowrappermaker/corbatype.hxx	2000/12/11 14:20:04	1.1
+++ codemaker/source/bonobowrappermaker/corbatype.hxx	2001/07/03 05:34:43
@@ -70,7 +70,11 @@
 #include <codemaker/dependency.hxx>
 #endif
 
+#if ( __GNU_STL__ == 3 )
+#include <ext/hash_set>
+#else
 #include <hash_set>
+#endif
 
 enum BASETYPE
 {
Index: codemaker/source/codemaker/global.cxx
===================================================================
RCS file: /cvs/oo/udk/codemaker/source/codemaker/global.cxx,v
retrieving revision 1.8
diff -u -r1.8 global.cxx
--- codemaker/source/codemaker/global.cxx	2001/05/10 20:07:30	1.8
+++ codemaker/source/codemaker/global.cxx	2001/07/03 05:34:44
@@ -325,7 +325,11 @@
 }	
 
 FileStream::FileStream(const OString& name, sal_Int32 nMode)
+#if ( __GNU_STL__ == 3 )
+	: ofstream(name, (std::_Ios_Openmode) nMode)
+#else
 	: ofstream(name, nMode)
+#endif
 	, m_name(name)
 {
 }	
@@ -339,7 +343,7 @@
 sal_Bool FileStream::isValid()
 {
 #if defined(SAL_UNX) || defined(SAL_OS2)
-#if STLPORT_VERSION < 400
+#if defined(STLPORT_VERSION) && STLPORT_VERSION < 400
 	if(rdbuf()->fd() < 0)
 #else
 	if( !is_open() )
@@ -360,7 +364,11 @@
 		m_name = name;
 	
 	if ( m_name.getLength() > 0 )
+#if ( __GNU_STL__ == 3 )
+		open(m_name, (std::_Ios_Openmode) nMode);
+#else
 		open(m_name, nMode);
+#endif
 }	
 
 void FileStream::closeFile()
Index: codemaker/source/cppumaker/cpputype.cxx
===================================================================
RCS file: /cvs/oo/udk/codemaker/source/cppumaker/cpputype.cxx,v
retrieving revision 1.14
diff -u -r1.14 cpputype.cxx
--- codemaker/source/cppumaker/cpputype.cxx	2001/05/10 20:07:30	1.14
+++ codemaker/source/cppumaker/cpputype.cxx	2001/07/03 05:34:52
@@ -76,6 +76,7 @@
 #include	"cppuoptions.hxx"
 
 using namespace rtl;
+using namespace std;
 
 //*************************************************************************
 // CppuType