diff options
Diffstat (limited to 'rdbmaker/inc/codemaker/global.hxx')
| -rw-r--r-- | rdbmaker/inc/codemaker/global.hxx | 27 |
1 files changed, 11 insertions, 16 deletions
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); |