[Libreoffice-commits] .: .gitignore unodevtools/inc

Joseph Powers jpowers at kemper.freedesktop.org
Thu Feb 3 21:22:15 PST 2011


 .gitignore                                  |    1 +
 unodevtools/inc/unodevtools/typemanager.hxx |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit ef810f3e4a9f0cb0c00761ac9b546da1709f6c68
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Feb 3 21:21:59 2011 -0800

    Fix a missed ::std::hash_map to boost::unordered_map typedef
    
    I also added the mac build directory to the gitignore.

diff --git a/.gitignore b/.gitignore
index 4890e11..d7ad641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /*/unxlng??.pro
 /*/wntmsc???
 /*/wntmsc???.pro
+/*/unxmac*.pro
\ No newline at end of file
diff --git a/unodevtools/inc/unodevtools/typemanager.hxx b/unodevtools/inc/unodevtools/typemanager.hxx
index 6ce5327..44d9ca3 100644
--- a/unodevtools/inc/unodevtools/typemanager.hxx
+++ b/unodevtools/inc/unodevtools/typemanager.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,21 +41,21 @@ namespace typereg { class Reader; }
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
 typedef	::std::__hash_map__
-<	
+<
     ::rtl::OString, // Typename
     RTTypeClass, 	// TypeClass
-    HashString, 
-    EqualString, 
+    HashString,
+    EqualString,
     NewAlloc
-> T2TypeClassMap; 
+> T2TypeClassMap;
 #else
-typedef	::std::hash_map
-<	
+typedef boost::unordered_map
+<
     ::rtl::OString, // Typename
     RTTypeClass, 	// TypeClass
-    HashString, 
+    HashString,
     EqualString
-> T2TypeClassMap; 
+> T2TypeClassMap;
 #endif
 
 namespace unodevtools {
@@ -67,7 +67,7 @@ struct UnoTypeManagerImpl
     T2TypeClassMap	m_t2TypeClass;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::container::XHierarchicalNameAccess> m_tdmgr;
-};	
+};
 
 class UnoTypeManager : public TypeManager
 {


More information about the Libreoffice-commits mailing list