Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
#endif
#include <memory>
#include <queue>
#include <hash_map>
#include <unordered_map>

class TextEngine;
class TextView;
Expand Down Expand Up @@ -343,7 +343,7 @@ private:
};


typedef ::std::hash_map< ::rtl::OUString,
typedef ::std::unordered_map< ::rtl::OUString,
::css::beans::PropertyValue,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > tPropValMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include <algorithm>
#include <vector>
#include <hash_map>
#include <unordered_map>

namespace css = ::com::sun::star;

Expand Down
6 changes: 3 additions & 3 deletions main/animations/source/animcore/targetpropertiescreator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include <animations/animationnodehelper.hxx>

#include <vector>
#include <hash_map>
#include <unordered_map>


using namespace ::com::sun::star;
Expand Down Expand Up @@ -136,7 +136,7 @@ namespace animcore
*/
sal_Int16 mnParagraphIndex;

/// Comparison needed for hash_map
/// Comparison needed for unordered_map
bool operator==( const ShapeHashKey& rRHS ) const
{
return mxRef == rRHS.mxRef && mnParagraphIndex == rRHS.mnParagraphIndex;
Expand Down Expand Up @@ -165,7 +165,7 @@ namespace animcore
};

// A hash map which maps a XShape to the corresponding vector of initial properties
typedef ::std::hash_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash;
typedef ::std::unordered_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash;

class NodeFunctor
{
Expand Down
4 changes: 2 additions & 2 deletions main/avmedia/source/macavf/macavf_player.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

using namespace ::com::sun::star;

#include <hash_map>
typedef std::hash_map<NSObject*,avmedia::macavf::MacAVObserverHandler*> HandlersForObject;
#include <unordered_map>
typedef std::unordered_map<NSObject*,avmedia::macavf::MacAVObserverHandler*> HandlersForObject;

@implementation MacAVObserverObject
{
Expand Down
4 changes: 2 additions & 2 deletions main/basctl/source/inc/bastypes.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class SfxItemSet;
#include <svtools/tabbar.hxx>
#include <com/sun/star/script/XLibraryContainer.hpp>

#include <hash_map>
#include <unordered_map>

#define LINE_SEP_CR 0x0D
#define LINE_SEP 0x0A
Expand Down Expand Up @@ -305,7 +305,7 @@ private:
}
};

typedef ::std::hash_map< LibInfoKey, LibInfoItem*, LibInfoKeyHash, ::std::equal_to< LibInfoKey > > LibInfoMap;
typedef ::std::unordered_map< LibInfoKey, LibInfoItem*, LibInfoKeyHash, ::std::equal_to< LibInfoKey > > LibInfoMap;
LibInfoMap m_aLibInfoMap;

public:
Expand Down
6 changes: 3 additions & 3 deletions main/basic/source/classes/sb.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include <com/sun/star/util/XCloseListener.hpp>
#include "errobject.hxx"
#include <map>
#include <hash_map>
#include <unordered_map>
#include <vector>
#include <algorithm>

Expand Down Expand Up @@ -1194,7 +1194,7 @@ struct ClassModuleRunInitItem
// Derive from has_map type instead of typedef
// to allow forward declaration in sbmod.hxx
class ModuleInitDependencyMap : public
std::hash_map< ::rtl::OUString, ClassModuleRunInitItem,
std::unordered_map< ::rtl::OUString, ClassModuleRunInitItem,
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
{};

Expand Down Expand Up @@ -2069,7 +2069,7 @@ SbxInfoRef BasicCollection::xItemInfo = NULL;
// Items may share a name (an item added without a key keeps the name of the
// variable it was copied from), so each name maps to all of its holders.
class CollectionNameMap : public
std::hash_map< ::rtl::OUString, std::vector< SbxVariable* >,
std::unordered_map< ::rtl::OUString, std::vector< SbxVariable* >,
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
{};

Expand Down
6 changes: 3 additions & 3 deletions main/basic/source/classes/sbunoobj.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ using namespace cppu;
#include<runtime.hxx>

#include<math.h>
#include <hash_map>
#include <unordered_map>
#include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp>
#include <com/sun/star/reflection/XConstantsTypeDescription.hpp>

Expand Down Expand Up @@ -3389,7 +3389,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit
refVar->PutBool( sal_True );
}

typedef std::hash_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash;
typedef std::unordered_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash;


// helper wrapper function to interact with TypeProvider and
Expand All @@ -3416,7 +3416,7 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot,
return xEnum;
}

typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
typedef std::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;

SbxVariable* getVBAConstant( const String& rName )
{
Expand Down
8 changes: 4 additions & 4 deletions main/basic/source/comp/sbcomp.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
// To activate tracing enable in sbtrace.hxx
#ifdef DBG_TRACE_BASIC

#include <hash_map>
#include <unordered_map>

// Trace ini file (set NULL to ignore)
// can be overridden with the environment variable OOO_BASICTRACEINI
Expand Down Expand Up @@ -239,8 +239,8 @@ struct TraceTextData
rtl::OString m_aTraceStr_STMNT;
rtl::OString m_aTraceStr_PCode;
};
typedef std::hash_map< sal_Int32, TraceTextData > PCToTextDataMap;
typedef std::hash_map< ::rtl::OUString, PCToTextDataMap*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleTraceMap;
typedef std::unordered_map< sal_Int32, TraceTextData > PCToTextDataMap;
typedef std::unordered_map< ::rtl::OUString, PCToTextDataMap*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleTraceMap;

ModuleTraceMap GaModuleTraceMap;
ModuleTraceMap& rModuleTraceMap = GaModuleTraceMap;
Expand Down Expand Up @@ -381,7 +381,7 @@ struct FunctionItem
, m_bBlockSteps( false )
{}
};
typedef std::hash_map< ::rtl::OUString, FunctionItem*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > FunctionItemMap;
typedef std::unordered_map< ::rtl::OUString, FunctionItem*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > FunctionItemMap;

static std::stack< double > GaCallEnterTimeStack;
static std::stack< FunctionItem* > GaFunctionItemStack;
Expand Down
4 changes: 2 additions & 2 deletions main/basic/source/inc/namecont.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#ifndef BASIC_NAMECONTAINER_HXX
#define BASIC_NAMECONTAINER_HXX

#include <hash_map>
#include <unordered_map>

#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
Expand Down Expand Up @@ -76,7 +76,7 @@ typedef ::cppu::WeakImplHelper3<

class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE
{
typedef std::hash_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > NameContainerNameMap;
typedef std::unordered_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > NameContainerNameMap;

NameContainerNameMap mHashMap;
::com::sun::star::uno::Sequence< ::rtl::OUString > mNames;
Expand Down
2 changes: 1 addition & 1 deletion main/basic/source/inc/scriptcont.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
{
friend class SfxScriptLibraryContainer;

typedef std::hash_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash > ModuleInfoMap;
typedef std::unordered_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash > ModuleInfoMap;

sal_Bool mbLoadedSource;
sal_Bool mbLoadedBinary;
Expand Down
4 changes: 2 additions & 2 deletions main/basic/source/runtime/step0.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj );

#include <algorithm>
#include <hash_map>
#include <unordered_map>

SbxVariable* getDefaultProp( SbxVariable* pRef );

Expand Down Expand Up @@ -445,7 +445,7 @@ struct SbxVariablePtrHash
{ return (size_t)pVar; }
};

typedef std::hash_map< SbxVariable*, DimAsNewRecoverItem, SbxVariablePtrHash > DimAsNewRecoverHash;
typedef std::unordered_map< SbxVariable*, DimAsNewRecoverItem, SbxVariablePtrHash > DimAsNewRecoverHash;

static DimAsNewRecoverHash GaDimAsNewRecoverHash;

Expand Down
4 changes: 2 additions & 2 deletions main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "sal/types.h"
#include "typelib/typedescription.hxx"

#include <hash_map>
#include <unordered_map>

/*See: http://people.redhat.com/drepper/selinux-mem.html*/
#if defined (LINUX) || defined (FREEBSD)
Expand Down Expand Up @@ -197,7 +197,7 @@ private:
static void flushCode(
unsigned char const * begin, unsigned char const * end);

typedef std::hash_map< rtl::OUString, Vtables, rtl::OUStringHash > Map;
typedef std::unordered_map< rtl::OUString, Vtables, rtl::OUStringHash > Map;

osl::Mutex m_mutex;
Map m_map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <stdio.h>
#include <stdlib.h>
#include <hash_map>
#include <unordered_map>

#include <rtl/alloc.h>
#include <osl/mutex.hxx>
Expand Down
8 changes: 4 additions & 4 deletions main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/except.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
#include <unordered_map>
#include <sys/param.h>

#include <rtl/strbuf.hxx>
Expand Down Expand Up @@ -58,8 +58,8 @@ namespace CPPU_CURRENT_NAMESPACE

namespace {

typedef hash_map< void *, typelib_TypeDescription * > ThrownTypes;
typedef hash_map< OUString, type_info *, OUStringHash > ObservedRttiMap;
typedef unordered_map< void *, typelib_TypeDescription * > ThrownTypes;
typedef unordered_map< OUString, type_info *, OUStringHash > ObservedRttiMap;

ThrownTypes & thrownTypes()
{
Expand Down Expand Up @@ -178,7 +178,7 @@ static OString mangledRttiSymbol( OUString const & unoName ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;

Mutex m_mutex;
t_rtti_map m_rttis;
Expand Down
2 changes: 1 addition & 1 deletion main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@


#include <stdlib.h>
#include <hash_map>
#include <unordered_map>

#include <rtl/alloc.h>
#include <osl/mutex.hxx>
Expand Down
4 changes: 2 additions & 2 deletions main/bridges/source/cpp_uno/gcc3_freebsd_arm/except.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
#include <unordered_map>

#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
Expand Down Expand Up @@ -96,7 +96,7 @@ namespace CPPU_CURRENT_NAMESPACE
//=====================================================================
class RTTI
{
typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;

Mutex m_mutex;
t_rtti_map m_rttis;
Expand Down
4 changes: 2 additions & 2 deletions main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
#include <unordered_map>

#include <sys/param.h>

Expand Down Expand Up @@ -104,7 +104,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;

Mutex m_mutex;
t_rtti_map m_rttis;
Expand Down
4 changes: 2 additions & 2 deletions main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/except.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
#include <unordered_map>

#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
Expand Down Expand Up @@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;

Mutex m_mutex;
t_rtti_map m_rttis;
Expand Down
4 changes: 2 additions & 2 deletions main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/except.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
#include <unordered_map>

#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
Expand Down Expand Up @@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;

Mutex m_mutex;
t_rtti_map m_rttis;
Expand Down
4 changes: 2 additions & 2 deletions main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
#include <unordered_map>

#include <sys/param.h>

Expand Down Expand Up @@ -104,7 +104,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;

Mutex m_mutex;
t_rtti_map m_rttis;
Expand Down
2 changes: 1 addition & 1 deletion main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
#include <unordered_map>

#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
Expand Down
2 changes: 1 addition & 1 deletion main/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@


#include <malloc.h>
#include <hash_map>
#include <unordered_map>

#include <rtl/alloc.h>
#include <osl/mutex.hxx>
Expand Down
2 changes: 1 addition & 1 deletion main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
#include <unordered_map>

#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
Expand Down
Loading
Loading