Commits

Cédric Bosdonnat  committed b984532

cbosdo06: cleanup and reenabling the commented headers in hash.cxx

  • Participants
  • Parent commits 5448dfa

Comments (0)

Files changed (1)

File sal/rtl/source/hash.cxx

  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#if 0
 #include "precompiled_sal.hxx"
 #include "rtl/allocator.hxx"
-#endif
 
 #include "hash.h"
 #include "strimp.h"
 #include <osl/diagnose.h>
 
-#if 0
-
-#include <hash_set>
-
-namespace {
-
-struct UStringHash
-{
-    size_t operator()(rtl_uString * const &rString) const
-    { return (size_t)rtl_ustr_hashCode_WithLength( rString->buffer, rString->length ); }
-};
-
-struct UStringEqual
-{
-    sal_Bool operator() ( rtl_uString * const &pStringA,
-                          rtl_uString * const &pStringB) const
-    {
-        if (pStringA == pStringB)
-            return true;
-        if (pStringA->length != pStringB->length)
-            return false;
-        return !rtl_ustr_compare_WithLength( pStringA->buffer, pStringA->length,
-                                             pStringB->buffer, pStringB->length);
-    }
-};
-
-typedef std::hash_set< rtl_uString *, UStringHash, UStringEqual,
-                       rtl::Allocator<rtl_uString *> > StringHashTable;
-
-StringHashTable *
-getHashTable ()
-{
-    static StringHashTable *pInternPool = NULL;
-    if (pInternPool == NULL) {
-        static StringHashTable aImpl(1024);
-        pInternPool = &aImpl;
-    }
-    return pInternPool;
-}
-
-}
-
-extern "C" {
-
-rtl_uString *
-rtl_str_hash_intern (rtl_uString       *pString,
-                     int                can_return)
-{
-    StringHashTable *pHash = getHashTable();
-    StringHashTable::iterator aIter;
-    aIter = pHash->find(pString);
-    if (aIter != pHash->end())
-    {
-        rtl_uString *pHashStr = *aIter;
-        rtl_uString_acquire (pHashStr);
-        return pHashStr;
-    }
-    if (!can_return)
-    {
-        rtl_uString *pCopy = NULL;
-        rtl_uString_newFromString( &pCopy, pString );
-        pString = pCopy;
-        if (!pString)
-            return NULL;
-    }
-
-    if (!SAL_STRING_IS_STATIC (pString))
-        pString->refCount |= SAL_STRING_INTERN_FLAG;
-    pHash->insert(pString);
-
-    return pString;
-}
-
-void
-rtl_str_hash_remove (rtl_uString       *pString)
-{
-    getHashTable()->erase(pString);
-}
-
-#endif
-
 // --------------------------- start here ---------------------------
 
 struct StringHashTableImpl {