PICout refactoring, new SHSTKMacros

This commit is contained in:
2022-08-07 22:07:26 +03:00
parent 1eaecb288f
commit 8551499a5e
36 changed files with 106 additions and 106 deletions

View File

@@ -2439,14 +2439,14 @@ inline std::ostream & operator <<(std::ostream & s, const PIDeque<T> & v) {
template<typename T>
inline PICout operator <<(PICout s, const PIDeque<T> & v) {
s.space();
s.setControl(0, true);
s.saveAndSetControls(0);
s << "{";
for (size_t i = 0; i < v.size(); ++i) {
s << v[i];
if (i < v.size() - 1) s << ", ";
}
s << "}";
s.restoreControl();
s.restoreControls();
return s;
}

View File

@@ -845,7 +845,7 @@ inline std::ostream & operator <<(std::ostream & s, const PIMap<Key, Type> & v)
template<typename Key, typename Type>
inline PICout operator <<(PICout s, const PIMap<Key, Type> & v) {
s.space();
s.setControl(0, true);
s.saveAndSetControls(0);
s << "{";
bool first = true;
for (typename PIMap<Key, Type>::const_iterator i = v.begin(); i != v.end(); ++i) {
@@ -855,7 +855,7 @@ inline PICout operator <<(PICout s, const PIMap<Key, Type> & v) {
s << i.key() << ": " << i.value();
}
s << "}";
s.restoreControl();
s.restoreControls();
return s;
}

View File

@@ -114,9 +114,9 @@ inline std::ostream & operator <<(std::ostream & s, const PIPair<Type0, Type1> &
template<typename Type0, typename Type1>
inline PICout operator <<(PICout s, const PIPair<Type0, Type1> & v) {
s.space();
s.setControl(0, true);
s.saveAndSetControls(0);
s << "(" << v.first << ", " << v.second << ")";
s.restoreControl();
s.restoreControls();
return s;
}

View File

@@ -145,7 +145,7 @@ template <typename T> PISet<T> operator &(const PISet<T> & v0, const PISet<T> &
template<typename Type>
inline PICout operator <<(PICout s, const PISet<Type> & v) {
s.space();
s.setControl(0, true);
s.saveAndSetControls(0);
s << "{";
bool first = true;
for (typename PIMap<Type, uchar>::const_iterator i = v.begin(); i != v.end(); ++i) {
@@ -155,7 +155,7 @@ inline PICout operator <<(PICout s, const PISet<Type> & v) {
s << i.key();
}
s << "}";
s.restoreControl();
s.restoreControls();
return s;
}

View File

@@ -2316,7 +2316,7 @@ inline std::ostream & operator <<(std::ostream & s, const PIVector<T> & v) {
template<typename T>
inline PICout operator <<(PICout s, const PIVector<T> & v) {
s.space();
s.setControl(0, true);
s.saveAndSetControls(0);
s << "{";
for (size_t i = 0; i < v.size(); ++i) {
s << v[i];
@@ -2325,7 +2325,7 @@ inline PICout operator <<(PICout s, const PIVector<T> & v) {
}
}
s << "}";
s.restoreControl();
s.restoreControls();
return s;
}

View File

@@ -292,7 +292,7 @@ protected:
template<typename T>
inline PICout operator <<(PICout s, const PIVector2D<T> & v) {
s.setControl(0, true);
s.saveAndSetControls(0);
s << "{";
for (size_t i = 0; i < v.rows(); ++i) {
s << "{ ";
@@ -305,7 +305,7 @@ inline PICout operator <<(PICout s, const PIVector2D<T> & v) {
}
if (v.isEmpty()) s << "{ }";
s << "}";
s.restoreControl();
s.restoreControls();
return s;
}