SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

map and set fix

Browse Source
This commit is contained in:
Пелипенко Иван
2022-08-01 19:07:23 +03:00
parent b1e220e454
commit ab7769dd5a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/main/containers/pimap.h
View File

@@ -369,7 +369,7 @@ inline std::ostream & operator <<(std::ostream & s, const PIMap<Key, Type> & v)
if (!first) if (!first)
s << ", "; s << ", ";
first = false; first = false;
s << i->first << ": " << i->second; s << i.key() << ": " << i.value();
} }
s << "}"; s << "}";
return s; return s;

10
libs/main/containers/piset.h
View File

@@ -87,14 +87,14 @@ public:
//! Unite set with "v" //! Unite set with "v"
PISet<T> & unite(const PISet<T> & v) { PISet<T> & unite(const PISet<T> & v) {
for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i) for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i)
_CSet::insert(i->first, 0); _CSet::insert(i.key(), 0);
return *this; return *this;
} }
//! Subtract set with "v" //! Subtract set with "v"
PISet<T> & subtract(const PISet<T> & v) { PISet<T> & subtract(const PISet<T> & v) {
for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i) for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i)
_CSet::remove(i->first); _CSet::remove(i.key());
return *this; return *this;
} }
@@ -121,10 +121,10 @@ public:
PISet<T> & operator &=(const PISet<T> & v) {return intersect(v);} PISet<T> & operator &=(const PISet<T> & v) {return intersect(v);}
//! Returns content of set as PIVector //! Returns content of set as PIVector
PIVector<T> toVector() const {PIVector<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << (*i).first; return ret;} PIVector<T> toVector() const {PIVector<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << i.key(); return ret;}
//! Returns content of set as PIDeque //! Returns content of set as PIDeque
PIDeque<T> toDeque() const {PIDeque<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << (*i).first; return ret;} PIDeque<T> toDeque() const {PIDeque<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << i.key(); return ret;}
}; };
@@ -152,7 +152,7 @@ inline PICout operator <<(PICout s, const PISet<Type> & v) {
if (!first) if (!first)
s << ", "; s << ", ";
first = false; first = false;
s << i->first; s << i.key();
} }
s << "}"; s << "}";
s.restoreControl(); s.restoreControl();