summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/conditio.hxx2
-rw-r--r--sc/inc/dbdata.hxx2
-rw-r--r--sc/inc/dpobject.hxx2
-rw-r--r--sc/inc/typedstrdata.hxx8
-rw-r--r--sc/qa/unit/ucalc_sharedformula.cxx2
-rw-r--r--sc/source/core/data/dpcache.cxx8
-rw-r--r--sc/source/core/data/dpobject.cxx2
-rw-r--r--sc/source/core/data/formulacell.cxx4
-rw-r--r--sc/source/core/data/sortparam.cxx2
-rw-r--r--sc/source/core/tool/interpr5.cxx10
-rw-r--r--sc/source/core/tool/scmatrix.cxx2
-rw-r--r--sc/workben/dpcache/perf-test.cpp7
12 files changed, 25 insertions, 26 deletions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 8dff0355a648..23e5a69752d4 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -165,7 +165,7 @@ protected:
};
-class approx_less : public std::binary_function<double, double, bool>
+class approx_less
{
public:
bool operator() (double nVal1, double nVal2) const
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 9412f23b7c65..a7b72bf9b0d0 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -101,7 +101,7 @@ private:
using ScRefreshTimer::operator==;
public:
- struct less : public ::std::binary_function<std::unique_ptr<ScDBData>, std::unique_ptr<ScDBData>, bool>
+ struct less
{
bool operator() (const std::unique_ptr<ScDBData>& left, const std::unique_ptr<ScDBData>& right) const;
};
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index aaed76a7e141..e258720daef6 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -324,7 +324,7 @@ public:
OUString maCommand;
DBType(sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand);
- struct less : public ::std::binary_function<DBType, DBType, bool>
+ struct less
{
bool operator() (const DBType& left, const DBType& right) const;
};
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index e7c47a47c9e1..8b9cb24f8734 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -36,22 +36,22 @@ public:
StringType GetStringType() const { return meStrType;}
double GetValue() const { return mfValue; }
- struct LessCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
+ struct LessCaseSensitive
{
bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const;
};
- struct LessCaseInsensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
+ struct LessCaseInsensitive
{
bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const;
};
- struct EqualCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
+ struct EqualCaseSensitive
{
bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const;
};
- struct EqualCaseInsensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
+ struct EqualCaseInsensitive
{
bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const;
};
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index dcf4accd0307..8a72cb88d88d 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -574,7 +574,7 @@ void Test::testSharedFormulasRefUpdateRange()
m_pDoc->DeleteTab(0);
}
-struct SortByArea : std::binary_function<sc::AreaListener, sc::AreaListener, bool>
+struct SortByArea
{
bool operator ()( const sc::AreaListener& rLeft, const sc::AreaListener& rRight ) const
{
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 9cc82795d3da..75b337ff83b6 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -195,7 +195,7 @@ struct PrintBucket
#endif
-struct LessByValue : std::binary_function<Bucket, Bucket, bool>
+struct LessByValue
{
bool operator() (const Bucket& left, const Bucket& right) const
{
@@ -203,7 +203,7 @@ struct LessByValue : std::binary_function<Bucket, Bucket, bool>
}
};
-struct LessByOrderIndex : std::binary_function<Bucket, Bucket, bool>
+struct LessByOrderIndex
{
bool operator() (const Bucket& left, const Bucket& right) const
{
@@ -211,7 +211,7 @@ struct LessByOrderIndex : std::binary_function<Bucket, Bucket, bool>
}
};
-struct LessByDataIndex : std::binary_function<Bucket, Bucket, bool>
+struct LessByDataIndex
{
bool operator() (const Bucket& left, const Bucket& right) const
{
@@ -219,7 +219,7 @@ struct LessByDataIndex : std::binary_function<Bucket, Bucket, bool>
}
};
-struct EqualByOrderIndex : std::binary_function<Bucket, Bucket, bool>
+struct EqualByOrderIndex
{
bool operator() (const Bucket& left, const Bucket& right) const
{
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index fdba353ca7ed..bc655a606e6f 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1348,7 +1348,7 @@ public:
}
};
-class LessByDimOrder : public std::binary_function<sheet::DataPilotFieldFilter, sheet::DataPilotFieldFilter, bool>
+class LessByDimOrder
{
const ScDPSaveData::DimOrderType& mrDimOrder;
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 7494f567bb24..2f340a7aa602 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -306,7 +306,7 @@ lcl_checkRangeDimensions(
return bOk && aCur == rEnd;
}
-class LessByReference : public std::binary_function<const formula::FormulaToken*, const formula::FormulaToken*, bool>
+class LessByReference
{
ScAddress maPos;
DimensionSelector maFunc;
@@ -327,7 +327,7 @@ public:
* denoted by token p1. Dimension, in which the comparison takes place, is
* given by maFunc.
*/
-class AdjacentByReference : public std::binary_function<const formula::FormulaToken*, const formula::FormulaToken*, bool>
+class AdjacentByReference
{
ScAddress maPos;
DimensionSelector maFunc;
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 3eb29a305641..5ab81b70d3a3 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -248,7 +248,7 @@ namespace {
struct ReorderIndex
{
- struct LessByPos2 : std::binary_function<ReorderIndex, ReorderIndex, bool>
+ struct LessByPos2
{
bool operator() ( const ReorderIndex& r1, const ReorderIndex& r2 ) const
{
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 1947af156de5..db8fd8605075 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -46,7 +46,7 @@ using namespace formula;
namespace {
-struct MatrixAdd : public ::std::binary_function<double,double,double>
+struct MatrixAdd
{
double operator() (const double& lhs, const double& rhs) const
{
@@ -54,7 +54,7 @@ struct MatrixAdd : public ::std::binary_function<double,double,double>
}
};
-struct MatrixSub : public ::std::binary_function<double,double,double>
+struct MatrixSub
{
double operator() (const double& lhs, const double& rhs) const
{
@@ -62,7 +62,7 @@ struct MatrixSub : public ::std::binary_function<double,double,double>
}
};
-struct MatrixMul : public ::std::binary_function<double,double,double>
+struct MatrixMul
{
double operator() (const double& lhs, const double& rhs) const
{
@@ -70,7 +70,7 @@ struct MatrixMul : public ::std::binary_function<double,double,double>
}
};
-struct MatrixDiv : public ::std::binary_function<double,double,double>
+struct MatrixDiv
{
double operator() (const double& lhs, const double& rhs) const
{
@@ -78,7 +78,7 @@ struct MatrixDiv : public ::std::binary_function<double,double,double>
}
};
-struct MatrixPow : public ::std::binary_function<double,double,double>
+struct MatrixPow
{
double operator() (const double& lhs, const double& rhs) const
{
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 8a33b34e64df..f1b9472e3fb2 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1842,7 +1842,7 @@ public:
}
};
-struct ArrayMul : public std::binary_function<double, double, double>
+struct ArrayMul
{
double operator() (const double& lhs, const double& rhs) const
{
diff --git a/sc/workben/dpcache/perf-test.cpp b/sc/workben/dpcache/perf-test.cpp
index d93630e6ac56..28e7027207a2 100644
--- a/sc/workben/dpcache/perf-test.cpp
+++ b/sc/workben/dpcache/perf-test.cpp
@@ -15,7 +15,6 @@
#include <vector>
#include <iterator>
#include <algorithm>
-#include <functional>
using namespace std;
@@ -254,7 +253,7 @@ void print_buckets(const vector<bucket>& buckets, const char* msg)
cout << "---" << endl;
}
-struct less_by_value : std::binary_function<bucket, bucket, bool>
+struct less_by_value
{
bool operator() (const bucket& left, const bucket& right) const
{
@@ -262,7 +261,7 @@ struct less_by_value : std::binary_function<bucket, bucket, bool>
}
};
-struct less_by_data_index : std::binary_function<bucket, bucket, bool>
+struct less_by_data_index
{
bool operator() (const bucket& left, const bucket& right) const
{
@@ -270,7 +269,7 @@ struct less_by_data_index : std::binary_function<bucket, bucket, bool>
}
};
-struct equal_by_value : std::binary_function<bucket, bucket, bool>
+struct equal_by_value
{
bool operator() (const bucket& left, const bucket& right) const
{
generated by cgit (git 2.34.1) at 2024-07-05 10:45:46 +0000