PICout refactoring, new SHSTKMacros

libs/main/containers/piset.h

@@ -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;
 }