Merge develop to beatrice 2022-04 #660

Merged
serkixenos merged 79 commits from develop into beatrice 2022-04-14 08:38:52 +00:00
Showing only changes of commit 8c3a424bb6 - Show all commits

View file

@ -34,10 +34,10 @@ namespace graphene { namespace db {
struct undo_state
{
unordered_map<object_id_type, unique_ptr<object> > old_values;
unordered_map<object_id_type, object_id_type> old_index_next_ids;
std::unordered_set<object_id_type> new_ids;
unordered_map<object_id_type, unique_ptr<object> > removed;
unordered_map<object_id_type, unique_ptr<object> > old_values;
unordered_map<object_id_type, object_id_type> old_index_next_ids;
std::set<object_id_type, std::greater<object_id_type> > new_ids;
unordered_map<object_id_type, unique_ptr<object> > removed;
};