remove vos dependencies

3 files changed, 24 insertions, 29 deletions

diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx
index 6eeb66576a78..b406c60f45f8 100644
--- a/codemaker/inc/codemaker/global.hxx
+++ b/codemaker/inc/codemaker/global.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: global.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:25:26 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:04:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,21 +62,16 @@
 #ifndef _CODEMAKER_GLOBAL_HXX_
 #define _CODEMAKER_GLOBAL_HXX_
 
-#include    <list>
-#include    <vector>
-#include    <set>
+#include <list>
+#include <vector>
+#include <set>
 
-#include    <fstream.h>
+#include <fstream.h>
 
 #ifndef _RTL_USTRING_HXX_
-#include    <rtl/ustring.hxx>
+#include <rtl/ustring.hxx>
 #endif
 
-#ifndef _VOS_MACROS_HXX_
-#include    <vos/macros.hxx>
-#endif
-
-
 struct EqualString
 {
     sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
@@ -102,13 +97,13 @@ struct LessString
 };
 
 #if defined(_MSC_VER) &&  _MSC_VER < 1200
-typedef NAMESPACE_STD(new_alloc) NewAlloc;
+typedef ::std::new_alloc NewAlloc;
 #endif
 
 
-typedef NAMESPACE_STD(list) < ::rtl::OString >              StringList;
-typedef NAMESPACE_STD(vector)< ::rtl::OString >             StringVector;
-typedef NAMESPACE_STD(set) < ::rtl::OString, LessString >   StringSet;
+typedef ::std::list< ::rtl::OString >               StringList;
+typedef ::std::vector< ::rtl::OString >             StringVector;
+typedef ::std::set< ::rtl::OString, LessString >    StringSet;
 
 ::rtl::OString makeTempName(sal_Char* prefix);
 
diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx
index e7553f9fcd33..a8e7b1580a8f 100644
--- a/codemaker/inc/codemaker/options.hxx
+++ b/codemaker/inc/codemaker/options.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: options.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:25:26 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:04:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,14 +62,14 @@
 #ifndef _CODEMAKER_OPTIONS_HXX_
 #define _CODEMAKER_OPTIONS_HXX_
 
-#include    <hash_map>
+#include <hash_map>
 
 #ifndef _CODEMAKER_GLOBAL_HXX_
-#include    <codemaker/global.hxx>
+#include <codemaker/global.hxx>
 #endif
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef NAMESPACE_STD(__hash_map__)
+typedef ::std::__hash_map__
 <
     ::rtl::OString,
     ::rtl::OString,
@@ -78,7 +78,7 @@ typedef NAMESPACE_STD(__hash_map__)
     NewAlloc
 > OptionMap;
 #else
-typedef NAMESPACE_STD(hash_map)
+typedef ::std::hash_map
 <
     ::rtl::OString,
     ::rtl::OString,
diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx
index 9ccca7feb1dc..481541dbd800 100644
--- a/codemaker/inc/codemaker/typemanager.hxx
+++ b/codemaker/inc/codemaker/typemanager.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: typemanager.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-08 14:04:42 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:04:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,22 +59,22 @@
  *
  ************************************************************************/
 
-#include    <hash_map>
+#include <hash_map>
 
 #ifndef _CODEMAKER_TYPEMANAGER_HXX_
 #define _CODEMAKER_TYPEMANAGER_HXX_
 
 #ifndef _CODEMAKER_REGISTRY_HXX_
-#include    <codemaker/registry.hxx>
+#include <codemaker/registry.hxx>
 #endif
 
 RegistryTypeReaderLoader & getRegistryTypeReaderLoader();
 
 
-typedef NAMESPACE_STD(list) <Registry*>     RegistryList;
+typedef ::std::list< Registry* >    RegistryList;
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef NAMESPACE_STD(__hash_map__)
+typedef ::std::__hash_map__
 <
     ::rtl::OString, // Typename
     RTTypeClass,    // TypeClass
@@ -83,7 +83,7 @@ typedef NAMESPACE_STD(__hash_map__)
     NewAlloc
 > T2TypeClassMap;
 #else
-typedef NAMESPACE_STD(hash_map)
+typedef ::std::hash_map
 <
     ::rtl::OString, // Typename
     RTTypeClass,    // TypeClass