1 files changed, 11 insertions, 8 deletions
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 73c3fb16908b..7f625c59a1b7 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -38,7 +39,7 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //........................................................................
 namespace connectivity { namespace mozab {
@@ -71,7 +72,7 @@ namespace connectivity { namespace mozab {
             }
         };
 
-        typedef ::std::hash_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes;
+        typedef ::boost::unordered_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes;
 
         #define DEF_CARD_ACCESS( PropertyName ) \
             &nsIAbCard::Get##PropertyName, &nsIAbCard::Set##PropertyName
@@ -187,7 +188,7 @@ namespace connectivity { namespace mozab {
     // -------------------------------------------------------------------
     NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs)
     {
-        OSL_ENSURE( false, "MLdapAttributeMap::GetAttributes: not implemented!" );
+        OSL_FAIL( "MLdapAttributeMap::GetAttributes: not implemented!" );
         (void)aProperty;
         (void)aCount;
         (void)aAttrs;
@@ -219,7 +220,7 @@ namespace connectivity { namespace mozab {
     // -------------------------------------------------------------------
     NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies)
     {
-        OSL_ENSURE( false, "MLdapAttributeMap::SetAttributeList: not implemented!" );
+        OSL_FAIL( "MLdapAttributeMap::SetAttributeList: not implemented!" );
         (void)aProperty;
         (void)aAttributeList;
         (void)allowInconsistencies;
@@ -229,7 +230,7 @@ namespace connectivity { namespace mozab {
     // -------------------------------------------------------------------
     NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval)
     {
-        OSL_ENSURE( false, "MLdapAttributeMap::GetProperty: not implemented!" );
+        OSL_FAIL( "MLdapAttributeMap::GetProperty: not implemented!" );
         (void)aAttribute;
         (void)_retval;
         return NS_ERROR_NOT_IMPLEMENTED;
@@ -265,7 +266,7 @@ namespace connectivity { namespace mozab {
     // -------------------------------------------------------------------
     NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName)
     {
-        OSL_ENSURE( false, "MLdapAttributeMap::SetFromPrefs: not implemented!" );
+        OSL_FAIL( "MLdapAttributeMap::SetFromPrefs: not implemented!" );
         (void)aPrefBranchName;
         return NS_ERROR_NOT_IMPLEMENTED;
     }
@@ -395,7 +396,7 @@ namespace connectivity { namespace mozab {
                     _card.SetPreferMailFormat(format);
                 }
                 else
-                    OSL_ENSURE( false, "MLdapAttributeMap::fillCardFromResult: unexpected property without default setters!" );
+                    OSL_FAIL( "MLdapAttributeMap::fillCardFromResult: unexpected property without default setters!" );
             }
         }
     }
@@ -438,7 +439,7 @@ namespace connectivity { namespace mozab {
                     }
                 }
                 else
-                    OSL_ENSURE( false, "MLdapAttributeMap::fillResultFromCard: unexpected property without default getters!" );
+                    OSL_FAIL( "MLdapAttributeMap::fillResultFromCard: unexpected property without default getters!" );
             }
 
             _result.insert( prop->first, resultValue );
@@ -448,3 +449,5 @@ namespace connectivity { namespace mozab {
 //........................................................................
 } } // namespace connectivity::mozab
 //........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */