RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Refactoring SortUnique and EraseIf. Now they can work with deque as well.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-09-09 11:08:48 +03:00
parent 9f96e17617
commit b8197602fa
3 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
base/internal/message.hpp
View file

@ -1,5 +1,6 @@
#pragma once
#include "std/array.hpp"
#include "std/deque.hpp"
#include "std/functional.hpp"
#include "std/initializer_list.hpp"
#include "std/iterator.hpp"
@ -100,6 +101,11 @@ template <typename T> inline string DebugPrint(vector<T> const & v)
return ::my::impl::DebugPrintSequence(v.begin(), v.end());
}
template <typename T> inline string DebugPrint(deque<T> const & d)
{
return ::my::impl::DebugPrintSequence(d.begin(), d.end());
}
template <typename T> inline string DebugPrint(list<T> const & v)
{
return ::my::impl::DebugPrintSequence(v.begin(), v.end());

30
base/stl_helpers.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "std/algorithm.hpp"
#include "std/auto_ptr.hpp"
#include "std/functional.hpp"
#include "std/utility.hpp"
#include "std/vector.hpp"
@ -80,28 +81,29 @@ struct Equals<false, T, C>
};
} // namespace impl
// Sorts and removes duplicate entries from |v|.
template <typename T>
void SortUnique(vector<T> & v)
// Sorts and removes duplicate entries from |c|.
template <typename T, template <typename, typename = allocator<T>> class Container>
void SortUnique(Container<T> & c)
{
sort(v.begin(), v.end());
v.erase(unique(v.begin(), v.end()), v.end());
sort(c.begin(), c.end());
c.erase(unique(c.begin(), c.end()), c.end());
}
// Sorts according to |comp| and removes duplicate entries according to |pred| from |v|.
// Sorts according to |comp| and removes duplicate entries according to |pred| from |c|.
// Note. If several entries are equal according to |pred| an arbitrary entry of them
// is left in |v| after a call of this function.
template <typename T, typename TLess, typename TEquals>
void SortUnique(vector<T> & v, TLess && less, TEquals && equals)
// is left in |c| after a call of this function.
template <typename T, template <typename, typename = allocator<T>> class Container,
typename TLess, typename TEquals>
void SortUnique(Container<T> & c, TLess && less, TEquals && equals)
{
sort(v.begin(), v.end(), forward<TLess>(less));
v.erase(unique(v.begin(), v.end(), forward<TEquals>(equals)), v.end());
sort(c.begin(), c.end(), forward<TLess>(less));
c.erase(unique(c.begin(), c.end(), forward<TEquals>(equals)), c.end());
}
template <typename T, class TFn>
void EraseIf(vector<T> & v, TFn && fn)
template <typename T, template <typename, typename = allocator<T>> class Container, class TFn>
void EraseIf(Container<T> & c, TFn && fn)
{
v.erase(remove_if(v.begin(), v.end(), forward<TFn>(fn)), v.end());
c.erase(remove_if(c.begin(), c.end(), forward<TFn>(fn)), c.end());
}
// Creates a comparer being able to compare two instances of class C

1
std/auto_ptr.hpp
View file

@ -6,6 +6,7 @@
#include <memory>
using std::auto_ptr;
using std::allocator;
#ifdef DEBUG_NEW
#define new DEBUG_NEW