From b589c4cd8765b0611afe435354364df891d78852 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 29 Oct 2016 12:43:54 +0900 Subject: Omit comparator which is the same as default std::less Change-Id: I72a0b618577caececaaf3eb4df53d4cb192251da Reviewed-on: https://gerrit.libreoffice.org/30369 Tested-by: Jenkins Reviewed-by: Takeshi Abe --- sdext/source/minimizer/configurationaccess.cxx | 2 +- sdext/source/minimizer/configurationaccess.hxx | 9 +-------- sdext/source/minimizer/optimizationstats.cxx | 4 ++-- sdext/source/minimizer/optimizationstats.hxx | 9 +-------- 4 files changed, 5 insertions(+), 19 deletions(-) (limited to 'sdext') diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 49f34809e93a..f87acfa1908a 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -162,7 +162,7 @@ ConfigurationAccess::~ConfigurationAccess() OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const { - std::map< PPPOptimizerTokenEnum, OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) ); + std::map< PPPOptimizerTokenEnum, OUString >::const_iterator aIter( maStrings.find( eToken ) ); return aIter != maStrings.end() ? ((*aIter).second) : OUString(); } diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index 8cae507ecea9..72bc1034ba1e 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -102,14 +102,7 @@ class ConfigurationAccess private: - struct Compare - { - bool operator()( const PPPOptimizerTokenEnum s1, const PPPOptimizerTokenEnum s2 ) const - { - return s1 < s2; - } - }; - std::map < PPPOptimizerTokenEnum, OUString, Compare > maStrings; + std::map < PPPOptimizerTokenEnum, OUString > maStrings; std::vector< OptimizerSettings > maSettings; std::vector< OptimizerSettings > maInitialSettings; diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx index 04567a19e36c..b3f25bdd9a17 100644 --- a/sdext/source/minimizer/optimizationstats.cxx +++ b/sdext/source/minimizer/optimizationstats.cxx @@ -45,7 +45,7 @@ void OptimizationStats::SetStatusValue( const PPPOptimizerTokenEnum eStat, const const uno::Any* OptimizationStats::GetStatusValue( const PPPOptimizerTokenEnum eStat ) const { - std::map< PPPOptimizerTokenEnum, uno::Any, Compare >::const_iterator aIter( maStats.find( eStat ) ); + std::map< PPPOptimizerTokenEnum, uno::Any >::const_iterator aIter( maStats.find( eStat ) ); return aIter != maStats.end() ? &((*aIter).second) : nullptr; } @@ -54,7 +54,7 @@ css::beans::PropertyValues OptimizationStats::GetStatusSequence() { int i = 0; uno::Sequence< PropertyValue > aStatsSequence( maStats.size() ); - std::map< PPPOptimizerTokenEnum, uno::Any, Compare >::iterator aIter( maStats.begin() ); + std::map< PPPOptimizerTokenEnum, uno::Any >::iterator aIter( maStats.begin() ); while( aIter != maStats.end() ) { aStatsSequence[ i ].Name = TKGet( (*aIter).first ); diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx index 29a15aa0afa2..29824dae06be 100644 --- a/sdext/source/minimizer/optimizationstats.hxx +++ b/sdext/source/minimizer/optimizationstats.hxx @@ -28,14 +28,7 @@ class OptimizationStats { - struct Compare - { - bool operator()( const PPPOptimizerTokenEnum s1, const PPPOptimizerTokenEnum s2 ) const - { - return s1 < s2; - } - }; - std::map < PPPOptimizerTokenEnum, css::uno::Any, Compare > maStats; + std::map < PPPOptimizerTokenEnum, css::uno::Any > maStats; public: -- cgit