From: Wang Mingyu <[email protected]>
Fix build error: comparison object must be invocable with const.
Several comparators were missing the trailing 'const' on operator(),
causing build errors:
error: static assertion failed: comparison object must be invocable
with arguments of key_type
error: passing 'const ObjectComp*' as 'this' argument discards qualifiers
Fix by adding 'const' to:
- ObjectComp::operator() in src/imm/tools/imm_xmlw_dump.cc
- NodeNameCompare::operator() declaration in src/amf/amfd/node.h
and its definition in src/amf/amfd/node.cc
No functional changes.
Signed-off-by: Wang Mingyu <[email protected]>
---
src/amf/amfd/node.cc | 2 +-
src/amf/amfd/node.h | 2 +-
src/imm/tools/imm_xmlw_dump.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc
index 04f35e73c..9785a010f 100644
--- a/src/amf/amfd/node.cc
+++ b/src/amf/amfd/node.cc
@@ -43,7 +43,7 @@ bool operator<(const AVD_AVND &lhs, const AVD_AVND &rhs) {
}
}
-bool NodeNameCompare::operator()(const AVD_AVND *lhs, const AVD_AVND *rhs) {
+bool NodeNameCompare::operator()(const AVD_AVND *lhs, const AVD_AVND *rhs)
const {
return *lhs < *rhs;
}
diff --git a/src/amf/amfd/node.h b/src/amf/amfd/node.h
index 3456adb85..c6527d585 100644
--- a/src/amf/amfd/node.h
+++ b/src/amf/amfd/node.h
@@ -170,7 +170,7 @@ struct NodeNameCompare
typedef AVD_AVND first_argument_type;
typedef AVD_AVND second_argument_type;
typedef bool result_type;
- bool operator()(const AVD_AVND *lhs, const AVD_AVND *rhs);
+ bool operator()(const AVD_AVND *lhs, const AVD_AVND *rhs) const;
};
extern AmfDb<std::string, AVD_AVND> *node_name_db;
diff --git a/src/imm/tools/imm_xmlw_dump.cc b/src/imm/tools/imm_xmlw_dump.cc
index f8474c367..2da9befa6 100644
--- a/src/imm/tools/imm_xmlw_dump.cc
+++ b/src/imm/tools/imm_xmlw_dump.cc
@@ -39,7 +39,7 @@ typedef struct {
/* Comparision object for Object */
struct ObjectComp {
- bool operator()(const Object& lhs, const Object& rhs) {
+ bool operator()(const Object& lhs, const Object& rhs) const {
return (lhs.reversedDn.compare(rhs.reversedDn) < 0) ? true : false;
}
};
--
2.43.0
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
