From 87a9979c8938b800aab6e35903d60d24892e7f2e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 19 Oct 2017 17:18:17 +0200 Subject: overload std::hash for OUString and OString no need to explicitly specify it anymore Change-Id: I6ad9259cce77201fdd75152533f5151aae83e9ec Reviewed-on: https://gerrit.libreoffice.org/43567 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/unx/generic/dtrans/X11_selection.cxx | 8 ++++---- vcl/unx/generic/dtrans/X11_selection.hxx | 4 ++-- vcl/unx/generic/fontmanager/fontconfig.cxx | 10 +++++----- vcl/unx/generic/fontmanager/fontmanager.cxx | 8 ++++---- vcl/unx/generic/printer/cpdmgr.cxx | 22 +++++++++++----------- vcl/unx/generic/printer/cupsmgr.cxx | 18 +++++++++--------- vcl/unx/generic/printer/ppdparser.cxx | 8 ++++---- vcl/unx/generic/printer/printerinfomanager.cxx | 26 +++++++++++++------------- 8 files changed, 52 insertions(+), 52 deletions(-) (limited to 'vcl/unx/generic') diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index cbda1d98e6b7..9aef71b08a1d 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -201,9 +201,9 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) return aEncoding; } -std::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() +std::unordered_map< OUString, SelectionManager* >& SelectionManager::getInstances() { - static std::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; + static std::unordered_map< OUString, SelectionManager* > aInstances; return aInstances; } @@ -455,7 +455,7 @@ SelectionManager::~SelectionManager() { osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); - std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it; + std::unordered_map< OUString, SelectionManager* >::iterator it; for( it = getInstances().begin(); it != getInstances().end(); ++it ) if( it->second == this ) { @@ -671,7 +671,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) aDisplayName = OStringToOUString( getenv( "DISPLAY" ), RTL_TEXTENCODING_ISO_8859_1 ); SelectionManager* pInstance = nullptr; - std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName ); + std::unordered_map< OUString, SelectionManager* >::iterator it = getInstances().find( aDisplayName ); if( it != getInstances().end() ) pInstance = it->second; else pInstance = getInstances()[ aDisplayName ] = new SelectionManager(); diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 12d57a47b378..e6910f330a33 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -151,7 +151,7 @@ namespace x11 { >, public SelectionAdaptor { - static std::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances(); + static std::unordered_map< OUString, SelectionManager* >& getInstances(); // for INCR type selection transfer // INCR protocol is used if the data cannot @@ -345,7 +345,7 @@ namespace x11 { // caching for atoms std::unordered_map< Atom, OUString > m_aAtomToString; - std::unordered_map< OUString, Atom, OUStringHash > + std::unordered_map< OUString, Atom > m_aStringToAtom; // the registered selections diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 34b9ba27f642..cfdb53ba9a94 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -86,8 +86,8 @@ public: FcResult LocalizedElementFromPattern(FcPattern const * pPattern, FcChar8 **family, const char *elementtype, const char *elementlangtype); //to-do, make private and add some cleaner accessor methods - std::unordered_map< OString, OString, OStringHash > m_aFontNameToLocalized; - std::unordered_map< OString, OString, OStringHash > m_aLocalizedToCanonical; + std::unordered_map< OString, OString > m_aFontNameToLocalized; + std::unordered_map< OString, OString > m_aLocalizedToCanonical; private: void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements); @@ -474,7 +474,7 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i) memmove(pFSet->fonts + i, pFSet->fonts + i + 1, nTail*sizeof(FcPattern*)); } -void PrintFontManager::countFontconfigFonts( std::unordered_map& o_rVisitedPaths ) +void PrintFontManager::countFontconfigFonts( std::unordered_map& o_rVisitedPaths ) { #if OSL_DEBUG_LEVEL > 1 int nFonts = 0; @@ -1057,7 +1057,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi if( eFamilyRes == FcResultMatch ) { OString sFamily(reinterpret_cast(family)); - std::unordered_map< OString, OString, OStringHash >::const_iterator aI = + std::unordered_map< OString, OString >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); if (aI != rWrapper.m_aFontNameToLocalized.end()) sFamily = aI->second; @@ -1177,7 +1177,7 @@ FontConfigFontOptions* PrintFontManager::getFontOptions(const FastPrintFontInfo& OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 ); - std::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); + std::unordered_map< OString, OString >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); if (aI != rWrapper.m_aLocalizedToCanonical.end()) sFamily = aI->second; if( !sFamily.isEmpty() ) diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index dd0cfb7dc42a..0962ce6366a3 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -169,7 +169,7 @@ OString PrintFontManager::getDirectory( int nAtom ) const int PrintFontManager::getDirectoryAtom( const OString& rDirectory ) { int nAtom = 0; - std::unordered_map< OString, int, OStringHash >::const_iterator it + std::unordered_map< OString, int >::const_iterator it ( m_aDirToAtom.find( rDirectory ) ); if( it != m_aDirToAtom.end() ) nAtom = it->second; @@ -312,7 +312,7 @@ fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile, i { fontID nID = 0; - std::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); + std::unordered_map< OString, ::std::set< fontID > >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); if( set_it == m_aFontFileToFontID.end() ) return nID; @@ -334,7 +334,7 @@ std::vector PrintFontManager::findFontFileIDs( int nDirID, const OString { std::vector aIds; - std::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); + std::unordered_map< OString, ::std::set< fontID > >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); if( set_it == m_aFontFileToFontID.end() ) return aIds; @@ -754,7 +754,7 @@ void PrintFontManager::initialize() } // protect against duplicate paths - std::unordered_map< OString, int, OStringHash > visited_dirs; + std::unordered_map< OString, int > visited_dirs; // Don't search directories that fontconfig already did countFontconfigFonts( visited_dirs ); diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx index 7c932a410bba..5764e2d14444 100644 --- a/vcl/unx/generic/printer/cpdmgr.cxx +++ b/vcl/unx/generic/printer/cpdmgr.cxx @@ -154,13 +154,13 @@ void CPDManager::printerRemoved (GDBusConnection *, uniqueName << id << ", " << backend_name; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); OUString aUniqueName = OStringToOUString( uniqueName.str().c_str(), aEncoding ); - std::unordered_map::iterator it = pManager->m_aCPDDestMap.find( aUniqueName ); + std::unordered_map::iterator it = pManager->m_aCPDDestMap.find( aUniqueName ); if (it == pManager->m_aCPDDestMap.end()) { SAL_WARN("vcl.unx.print", "CPD trying to remove non-existent printer from list"); return; } pManager->m_aCPDDestMap.erase(it); - std::unordered_map::iterator printersIt = pManager->m_aPrinters.find( aUniqueName ); + std::unordered_map::iterator printersIt = pManager->m_aPrinters.find( aUniqueName ); if (printersIt == pManager->m_aPrinters.end()) { SAL_WARN("vcl.unx.print", "CPD trying to remove non-existent printer from m_aPrinters"); return; @@ -190,7 +190,7 @@ std::vector> CPDManager::getTempBackends() { void CPDManager::addNewPrinter(const OUString& aPrinterName, const OUString& aUniqueName, CPDPrinter *pDest) { std::pair newPrinter (aUniqueName, pDest); - std::unordered_map::iterator it = m_aCPDDestMap.find( aUniqueName ); + std::unordered_map::iterator it = m_aCPDDestMap.find( aUniqueName ); if (it == m_aCPDDestMap.end()) { m_aCPDDestMap.insert(newPrinter); } else { @@ -223,7 +223,7 @@ void CPDManager::addNewPrinter(const OUString& aPrinterName, const OUString& aUn // behaviour aPrinter.m_aInfo.m_pParser = nullptr; aPrinter.m_aInfo.m_aContext.setParser( nullptr ); - std::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aUniqueName ); + std::unordered_map< OUString, PPDContext >::const_iterator c_it = m_aDefaultContexts.find( aUniqueName ); if( c_it != m_aDefaultContexts.end() ) { aPrinter.m_aInfo.m_pParser = c_it->second.getParser(); @@ -301,7 +301,7 @@ CPDManager::~CPDManager() { g_object_unref(it->second); } - std::unordered_map::iterator dest_it = + std::unordered_map::iterator dest_it = m_aCPDDestMap.begin(); for(; dest_it != m_aCPDDestMap.end(); ++dest_it) { @@ -322,7 +322,7 @@ const PPDParser* CPDManager::createCPDParser( const OUString& rPrinter ) else aPrinter = rPrinter; - std::unordered_map< OUString, CPDPrinter *, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, CPDPrinter * >::iterator dest_it = m_aCPDDestMap.find( aPrinter ); if( dest_it != m_aCPDDestMap.end() ) @@ -517,7 +517,7 @@ void CPDManager::initialize() // remove everything that is not a CUPS printer and not // a special purpose printer (PDF, Fax) - std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin(); + std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.begin(); while (it != m_aPrinters.end()) { if( m_aCPDDestMap.find( it->first ) != m_aCPDDestMap.end() ) @@ -539,13 +539,13 @@ void CPDManager::initialize() void CPDManager::setupJobContextData( JobData& rData ) { #if ENABLE_DBUS && ENABLE_GIO - std::unordered_map::iterator dest_it = + std::unordered_map::iterator dest_it = m_aCPDDestMap.find( rData.m_aPrinterName ); if( dest_it == m_aCPDDestMap.end() ) return PrinterInfoManager::setupJobContextData( rData ); - std::unordered_map< OUString, Printer, OUStringHash >::iterator p_it = + std::unordered_map< OUString, Printer >::iterator p_it = m_aPrinters.find( rData.m_aPrinterName ); if( p_it == m_aPrinters.end() ) // huh ? { @@ -681,7 +681,7 @@ bool CPDManager::endSpool( const OUString& rPrintername, const OUString& rJobTit bool success = false; #if ENABLE_DBUS && ENABLE_GIO SAL_INFO( "vcl.unx.print", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies ); - std::unordered_map< OUString, CPDPrinter *, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, CPDPrinter * >::iterator dest_it = m_aCPDDestMap.find( rPrintername ); if( dest_it == m_aCPDDestMap.end() ) { @@ -777,7 +777,7 @@ bool CPDManager::setDefaultPrinter( const OUString& rName ) { bool bSuccess = false; #if ENABLE_DBUS && ENABLE_GIO - std::unordered_map< OUString, CPDPrinter *, OUStringHash >::iterator nit = + std::unordered_map< OUString, CPDPrinter * >::iterator nit = m_aCPDDestMap.find( rName ); if( nit != m_aCPDDestMap.end()) { diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index d96a85c4a38d..480aa2832609 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -333,7 +333,7 @@ void CUPSManager::initialize() // behaviour aPrinter.m_aInfo.m_pParser = nullptr; aPrinter.m_aInfo.m_aContext.setParser( nullptr ); - std::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName ); + std::unordered_map< OUString, PPDContext >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName ); if( c_it != m_aDefaultContexts.end() ) { aPrinter.m_aInfo.m_pParser = c_it->second.getParser(); @@ -350,7 +350,7 @@ void CUPSManager::initialize() // remove everything that is not a CUPS printer and not // a special purpose printer (PDF, Fax) std::list< OUString > aRemovePrinters; - for( std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin(); + for( std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) { if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() ) @@ -425,7 +425,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) { if (m_nDests && m_pDests) { - std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int >::iterator dest_it = m_aCUPSDestMap.find( aPrinter ); if( dest_it != m_aCUPSDestMap.end() ) { @@ -504,13 +504,13 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) void CUPSManager::setupJobContextData( JobData& rData ) { - std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int >::iterator dest_it = m_aCUPSDestMap.find( rData.m_aPrinterName ); if( dest_it == m_aCUPSDestMap.end() ) return PrinterInfoManager::setupJobContextData( rData ); - std::unordered_map< OUString, Printer, OUStringHash >::iterator p_it = + std::unordered_map< OUString, Printer >::iterator p_it = m_aPrinters.find( rData.m_aPrinterName ); if( p_it == m_aPrinters.end() ) // huh ? { @@ -625,7 +625,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi osl::MutexGuard aGuard( m_aCUPSMutex ); - std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int >::iterator dest_it = m_aCUPSDestMap.find( rPrintername ); if( dest_it == m_aCUPSDestMap.end() ) { @@ -753,7 +753,7 @@ bool CUPSManager::removePrinter( const OUString& rName, bool bCheck ) bool CUPSManager::setDefaultPrinter( const OUString& rName ) { bool bSuccess = false; - std::unordered_map< OUString, int, OUStringHash >::iterator nit = + std::unordered_map< OUString, int >::iterator nit = m_aCUPSDestMap.find( rName ); if( nit != m_aCUPSDestMap.end() && m_aCUPSMutex.tryToAcquire() ) { @@ -777,10 +777,10 @@ bool CUPSManager::writePrinterConfig() bool bDestModified = false; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - for( std::unordered_map< OUString, Printer, OUStringHash >::iterator prt = + for( std::unordered_map< OUString, Printer >::iterator prt = m_aPrinters.begin(); prt != m_aPrinters.end(); ++prt ) { - std::unordered_map< OUString, int, OUStringHash >::iterator nit = + std::unordered_map< OUString, int >::iterator nit = m_aCUPSDestMap.find( prt->first ); if( nit == m_aCUPSDestMap.end() ) continue; diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 292010dfec8c..40ffdfeb44c4 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -80,7 +80,7 @@ namespace psp }; typedef std::unordered_map< css::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map; - typedef std::unordered_map< OUString, translation_map, OUStringHash > key_translation_map; + typedef std::unordered_map< OUString, translation_map > key_translation_map; key_translation_map m_aTranslations; public: @@ -240,7 +240,7 @@ namespace psp { public: std::vector< std::unique_ptr > aAllParsers; - std::unique_ptr> pAllPPDFiles; + std::unique_ptr> pAllPPDFiles; PPDCache() : pAllPPDFiles(nullptr) {} @@ -440,7 +440,7 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache) if( rPPDCache.pAllPPDFiles ) return; - rPPDCache.pAllPPDFiles.reset(new std::unordered_map< OUString, OUString, OUStringHash >); + rPPDCache.pAllPPDFiles.reset(new std::unordered_map< OUString, OUString >); // check installation directories std::vector< OUString > aPathList; @@ -475,7 +475,7 @@ OUString PPDParser::getPPDFile( const OUString& rFile ) PPDDecompressStream aStream( aPPD.PathToFileName() ); if( ! aStream.IsOpen() ) { - std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; + std::unordered_map< OUString, OUString >::const_iterator it; PPDCache &rPPDCache = thePPDCache::get(); bool bRetry = true; diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 9b8274069fd3..cdd5580b7452 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -458,7 +458,7 @@ void PrinterInfoManager::initialize() FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile ); aPrinter.m_bModified = false; aPrinter.m_aGroup = aConfig.GetGroupName( nGroup ); - std::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it = + std::unordered_map< OUString, Printer >::const_iterator find_it = m_aPrinters.find( aPrinterName ); if( find_it != m_aPrinters.end() ) { @@ -537,7 +537,7 @@ void PrinterInfoManager::initialize() void PrinterInfoManager::listPrinters( ::std::vector< OUString >& rVector ) const { - std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it; + std::unordered_map< OUString, Printer >::const_iterator it; rVector.clear(); for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) rVector.push_back( it->first ); @@ -546,7 +546,7 @@ void PrinterInfoManager::listPrinters( ::std::vector< OUString >& rVector ) cons const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const { static PrinterInfo aEmptyInfo; - std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter ); + std::unordered_map< OUString, Printer >::const_iterator it = m_aPrinters.find( rPrinter ); SAL_WARN_IF( it == m_aPrinters.end(), "vcl", "Do not ask for info about nonexistent printers" ); @@ -568,9 +568,9 @@ static bool checkWriteability( const OUString& rUniPath ) bool PrinterInfoManager::writePrinterConfig() { // find at least one writeable config - std::unordered_map< OUString, Config*, OUStringHash > files; - std::unordered_map< OUString, int, OUStringHash > rofiles; - std::unordered_map< OUString, Config*, OUStringHash >::iterator file_it; + std::unordered_map< OUString, Config* > files; + std::unordered_map< OUString, int > rofiles; + std::unordered_map< OUString, Config* >::iterator file_it; for( ::std::vector< WatchFile >::const_iterator wit = m_aWatchFiles.begin(); wit != m_aWatchFiles.end(); ++wit ) { @@ -587,7 +587,7 @@ bool PrinterInfoManager::writePrinterConfig() Config* pGlobal = files.begin()->second; pGlobal->SetGroup( GLOBAL_DEFAULTS_GROUP ); - std::unordered_map< OUString, Printer, OUStringHash >::iterator it; + std::unordered_map< OUString, Printer >::iterator it; for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) { if( ! it->second.m_bModified ) @@ -757,7 +757,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec { bool bSuccess = true; - std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); + std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { if( !it->second.m_aFile.isEmpty() ) @@ -809,7 +809,7 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName ) { bool bSuccess = false; - std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); + std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { bSuccess = true; @@ -855,7 +855,7 @@ bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUStr void PrinterInfoManager::setupJobContextData( JobData& rData ) { - std::unordered_map< OUString, Printer, OUStringHash >::iterator it = + std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.find( rData.m_aPrinterName ); if( it != m_aPrinters.end() ) { @@ -967,8 +967,8 @@ static void lpgetSysQueueTokenHandler( const SystemCommandParameters* ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - std::unordered_set< OUString, OUStringHash > aUniqueSet; - std::unordered_set< OUString, OUStringHash > aOnlySet; + std::unordered_set< OUString > aUniqueSet; + std::unordered_set< OUString > aOnlySet; aUniqueSet.insert( OUString( "_all" ) ); aUniqueSet.insert( OUString( "_default" ) ); @@ -1064,7 +1064,7 @@ static void standardSysQueueTokenHandler( const SystemCommandParameters* i_pParms) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - std::unordered_set< OUString, OUStringHash > aUniqueSet; + std::unordered_set< OUString > aUniqueSet; OString aForeToken( i_pParms->pForeToken ); OString aAftToken( i_pParms->pAftToken ); /* Normal Unix print queue discovery, also used for Darwin 5 LPR printing -- cgit