From a1c939e4579eb253f7956460a365eb260e835768 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Sat, 15 Sep 2018 21:07:26 +0200 Subject: [PATCH] use ext::less in extended containers --- alib2std/src/extensions/container/map.hpp | 3 ++- alib2std/src/extensions/container/set.hpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/alib2std/src/extensions/container/map.hpp b/alib2std/src/extensions/container/map.hpp index 416458d173..b5b39124db 100644 --- a/alib2std/src/extensions/container/map.hpp +++ b/alib2std/src/extensions/container/map.hpp @@ -35,6 +35,7 @@ #include <extensions/compare.hpp> #include <extensions/allocFix.hpp> #include <extensions/range.hpp> +#include <extensions/functional.hpp> namespace ext { @@ -49,7 +50,7 @@ namespace ext { * \tparam Cmp the comparator type used to order keys * \tparam Alloc the allocator of values of type T */ -template < typename T, typename R, typename Cmp = std::less < >, typename Alloc = std::allocator < std::pair < const T, R > > > +template < typename T, typename R, typename Cmp = ext::less < >, typename Alloc = std::allocator < std::pair < const T, R > > > class map : public std::map < T, R, Cmp, Alloc >, AllocFix < Alloc > { public: /** diff --git a/alib2std/src/extensions/container/set.hpp b/alib2std/src/extensions/container/set.hpp index 9cd582ffde..783b6f33c1 100644 --- a/alib2std/src/extensions/container/set.hpp +++ b/alib2std/src/extensions/container/set.hpp @@ -32,6 +32,7 @@ #include <extensions/compare.hpp> #include <extensions/allocFix.hpp> #include <extensions/range.hpp> +#include <extensions/functional.hpp> namespace ext { @@ -44,7 +45,7 @@ namespace ext { * \tparam Cmp the comparator type used to order keys * \tparam Alloc the allocator of values of type T */ -template < typename T, typename Cmp = std::less < >, typename Alloc = std::allocator < T > > +template < typename T, typename Cmp = ext::less < >, typename Alloc = std::allocator < T > > class set : public std::set < T, Cmp, Alloc >, AllocFix < Alloc > { public: /** -- GitLab