[EMAIL PROTECTED] wrote:
Tag: cws_src680_obo10
User: obo
Date: 2007-08-21 06:58:59+0000
Modified:
udk/idlc/inc/idlc/idlctypes.hxx
Log:
#i75046# windows 64bit remove dependency to stlport
Hi Oliver,
Please apply the attached simplifying patch to idlc before doing your
64bit-sans-stlport changes in idlc/inc/idlc/idlctypes.hxx and
idlc/inc/idlc/options.hxx. That way, there is one less string hash
functor definition to #ifdef.
Thanks,
-Stephan
Index: inc/idlc/idlctypes.hxx
===================================================================
RCS file: /cvs/udk/idlc/inc/idlc/idlctypes.hxx,v
retrieving revision 1.6
diff -u -p -r1.6 idlctypes.hxx
--- inc/idlc/idlctypes.hxx 7 Sep 2005 18:04:36 -0000 1.6
+++ inc/idlc/idlctypes.hxx 21 Aug 2007 07:31:37 -0000
@@ -42,6 +42,9 @@
#include <vector>
#include <set>
+#ifndef _RTL_STRING_HXX_
+#include <rtl/string.hxx>
+#endif
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif
@@ -49,33 +52,9 @@
#include <rtl/ustring.hxx>
#endif
-struct EqualString
-{
- sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
- {
- return (str1 == str2);
- }
-};
-
-struct HashString
-{
- sal_Int32 operator()(const ::rtl::OString& str) const
- {
- return str.hashCode();
- }
-};
-
-struct LessString
-{
- sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
- {
- return (str1 < str2);
- }
-};
-
typedef ::std::list< ::rtl::OString > StringList;
typedef ::std::vector< ::rtl::OString > StringVector;
-typedef ::std::set< ::rtl::OString, LessString > StringSet;
+typedef ::std::set< ::rtl::OString > StringSet;
class AstExpression;
typedef ::std::list< AstExpression* > ExprList;
@@ -85,7 +64,7 @@ typedef ::std::list< AstUnionLabel* >
class AstDeclaration;
-typedef ::std::hash_map< ::rtl::OString, AstDeclaration*, HashString, EqualString > DeclMap;
+typedef ::std::hash_map< ::rtl::OString, AstDeclaration*, ::rtl::OStringHash > DeclMap;
typedef ::std::list< AstDeclaration* > DeclList;
class AstScope;
Index: inc/idlc/options.hxx
===================================================================
RCS file: /cvs/udk/idlc/inc/idlc/options.hxx,v
retrieving revision 1.3
diff -u -p -r1.3 options.hxx
--- inc/idlc/options.hxx 7 Sep 2005 18:05:11 -0000 1.3
+++ inc/idlc/options.hxx 21 Aug 2007 07:31:37 -0000
@@ -42,8 +42,7 @@
typedef ::std::hash_map< ::rtl::OString,
::rtl::OString,
- HashString,
- EqualString > OptionMap;
+ ::rtl::OStringHash > OptionMap;
class IllegalArgument
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
