remove vos dependencies

4 files changed, 27 insertions, 32 deletions

diff --git a/rdbmaker/inc/codemaker/dependency.hxx b/rdbmaker/inc/codemaker/dependency.hxx
index f8b2d1805931..d3cb9cc8eb30 100644
--- a/rdbmaker/inc/codemaker/dependency.hxx
+++ b/rdbmaker/inc/codemaker/dependency.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dependency.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,11 +122,11 @@ struct LessTypeUsing
     }
 };
 
-typedef NAMESPACE_STD(set) <TypeUsing, LessTypeUsing> TypeUsingSet;
+typedef ::std::set< TypeUsing, LessTypeUsing > TypeUsingSet;
 
 
 #if (defined( _MSC_VER ) && ( _MSC_VER < 1200 ))
-typedef NAMESPACE_STD(__hash_map__)
+typedef ::std::__hash_map__
 <
     ::rtl::OString,
     TypeUsingSet,
@@ -135,7 +135,7 @@ typedef NAMESPACE_STD(__hash_map__)
     NewAlloc
 > DependencyMap;
 
-typedef NAMESPACE_STD(__hash_map__)
+typedef ::std::__hash_map__
 <
     ::rtl::OString,
     sal_uInt16,
@@ -144,7 +144,7 @@ typedef NAMESPACE_STD(__hash_map__)
     NewAlloc
 > GenerationMap;
 #else
-typedef NAMESPACE_STD(hash_map)
+typedef ::std::hash_map
 <
     ::rtl::OString,
     TypeUsingSet,
@@ -152,7 +152,7 @@ typedef NAMESPACE_STD(hash_map)
     EqualString
 > DependencyMap;
 
-typedef NAMESPACE_STD(hash_map)
+typedef ::std::hash_map
 <
     ::rtl::OString,
     sal_uInt16,
diff --git a/rdbmaker/inc/codemaker/global.hxx b/rdbmaker/inc/codemaker/global.hxx
index 6ab359efd970..861a735383cc 100644
--- a/rdbmaker/inc/codemaker/global.hxx
+++ b/rdbmaker/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:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:14 $
  *
  *  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/rdbmaker/inc/codemaker/options.hxx b/rdbmaker/inc/codemaker/options.hxx
index 875d3e785d9b..02be540d7b2b 100644
--- a/rdbmaker/inc/codemaker/options.hxx
+++ b/rdbmaker/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:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,7 +69,7 @@
 #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/rdbmaker/inc/codemaker/typemanager.hxx b/rdbmaker/inc/codemaker/typemanager.hxx
index 030dd962795e..3c05b6d2adb3 100644
--- a/rdbmaker/inc/codemaker/typemanager.hxx
+++ b/rdbmaker/inc/codemaker/typemanager.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: typemanager.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,10 +71,10 @@
 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