tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove inheriting TotalOrdering in TypedValue

Browse Source 
Reviewers: mtomic, mferencevic

Reviewed By: mferencevic

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2070
This commit is contained in:
Teon Banek 2019-05-20 11:11:24 +02:00
parent 7e7b6c7535
commit ee2fa47b29
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/query/typed_value.hpp
View File

@ -14,7 +14,6 @@
#include "storage/edge_accessor.hpp" #include "storage/edge_accessor.hpp"
#include "storage/vertex_accessor.hpp" #include "storage/vertex_accessor.hpp"
#include "utils/exceptions.hpp" #include "utils/exceptions.hpp"
#include "utils/total_ordering.hpp"
namespace query { namespace query {
@ -26,8 +25,7 @@ namespace query {
* Values can be of a number of predefined types that are enumerated in * Values can be of a number of predefined types that are enumerated in
* TypedValue::Type. Each such type corresponds to exactly one C++ type. * TypedValue::Type. Each such type corresponds to exactly one C++ type.
*/ */
class TypedValue class TypedValue {
: public utils::TotalOrdering<TypedValue, TypedValue, TypedValue> {
public: public:
/** Custom TypedValue equality function that returns a bool /** Custom TypedValue equality function that returns a bool
* (as opposed to returning TypedValue as the default equality does). * (as opposed to returning TypedValue as the default equality does).
@ -274,4 +272,20 @@ TypedValue operator^(const TypedValue &a, const TypedValue &b);
// stream output // stream output
std::ostream &operator<<(std::ostream &os, const TypedValue::Type type); std::ostream &operator<<(std::ostream &os, const TypedValue::Type type);
inline TypedValue operator!=(const TypedValue &a, const TypedValue &b) {
return !(a == b);
}
inline TypedValue operator<=(const TypedValue &a, const TypedValue &b) {
return a < b || a == b;
}
inline TypedValue operator>(const TypedValue &a, const TypedValue &b) {
return !(a <= b);
}
inline TypedValue operator>=(const TypedValue &a, const TypedValue &b) {
return !(a < b);
}
} // namespace query } // namespace query