pibytearray patch, now automatic supports all simple types

libs/main/core/pibytearray.h

@@ -28,22 +28,6 @@
 #include "pimap.h"
 #include "pivector2d.h"
 
-
-#define __PIBYTEARRAY_SIMPLE_TYPE__(T) \
-template<> \
-inline PIByteArray & operator <<(PIByteArray & s, const PIVector<T> & v) {s << int(v.size_s()); int os = s.size_s(); s.enlarge(v.size_s()*sizeof(T)); memcpy(s.data(os), v.data(), v.size_s()*sizeof(T)); return s;} \
-template<> \
-inline PIByteArray & operator >>(PIByteArray & s, PIVector<T> & v) {assert(s.size_s() >= 4); int sz; s >> sz; v._resizeRaw(sz); if (sz > 0) memcpy(v.data(), s.data(), sz*sizeof(T)); s.remove(0, sz*sizeof(T)); return s;} \
-template<> \
-inline PIByteArray & operator <<(PIByteArray & s, const PIDeque<T> & v) {s << int(v.size_s()); int os = s.size_s(); s.enlarge(v.size_s()*sizeof(T)); memcpy(s.data(os), v.data(), v.size_s()*sizeof(T)); return s;} \
-template<> \
-inline PIByteArray & operator >>(PIByteArray & s, PIDeque<T> & v) {assert(s.size_s() >= 4); int sz; s >> sz; v._resizeRaw(sz); if (sz > 0) memcpy(v.data(), s.data(), sz*sizeof(T)); s.remove(0, sz*sizeof(T)); return s;} \
-template<> \
-inline PIByteArray & operator <<(PIByteArray & s, const PIVector2D<T> & v) {s << int(v.rows()) << int(v.cols()); int os = s.size_s(); s.enlarge(v.size_s()*sizeof(T)); memcpy(s.data(os), v.data(), v.size_s()*sizeof(T)); return s;} \
-template<> \
-inline PIByteArray & operator >>(PIByteArray & s, PIVector2D<T> & v) {assert(s.size_s() >= 8); int r, c; s >> r >> c; v._resizeRaw(r, c); int sz = r*c; if (sz > 0) memcpy(v.data(), s.data(), sz*sizeof(T)); s.remove(0, sz*sizeof(T)); return s;}
-
-
 class PIString;
 class PIByteArray;
 
@@ -137,7 +121,36 @@ public:
 	static PIByteArray fromBase64(const PIString & base64);
 };
 
-inline bool operator <(const PIByteArray & v0, const PIByteArray & v1) {if (v0.size() == v1.size()) {for (uint i = 0; i < v0.size(); ++i) if (v0[i] != v1[i]) return v0[i] < v1[i]; return false;} return v0.size() < v1.size();}
+//! \relatesalso PIByteArray \brief Byte arrays compare operator
+inline bool operator <(const PIByteArray & v0, const PIByteArray & v1) {
+	if (v0.size() == v1.size()) {
+		for (uint i = 0; i < v0.size(); ++i)
+			if (v0[i] != v1[i])
+				return v0[i] < v1[i];
+		return false;
+	}
+	return v0.size() < v1.size();
+}
+
+//! \relatesalso PIByteArray \brief Byte arrays compare operator
+inline bool operator ==(PIByteArray & f, PIByteArray & s) {
+	if (f.size_s() != s.size_s())
+		return false;
+	for (int i = 0; i < f.size_s(); ++i)
+		if (f[i] != s[i])
+			return false;
+	return true;
+}
+
+//! \relatesalso PIByteArray \brief Byte arrays compare operator
+inline bool operator !=(PIByteArray & f, PIByteArray & s) {
+	if (f.size_s() != s.size_s())
+		return true;
+	for (int i = 0; i < f.size_s(); ++i)
+		if (f[i] != s[i])
+			return true;
+	return false;
+}
 
 #ifdef PIP_STD_IOSTREAM
 //! \relatesalso PIByteArray \brief Output to std::ostream operator
@@ -147,114 +160,260 @@ inline std::ostream & operator <<(std::ostream & s, const PIByteArray & ba);
 //! \relatesalso PIByteArray \brief Output to PICout operator
 PIP_EXPORT PICout operator <<(PICout s, const PIByteArray & ba);
 
+
+
+
+// store operators for basic types
+
+
 #define PBA_OPERATOR_TO int os = s.size_s(); s.enlarge(sizeof(v)); memcpy(s.data(os), &v, sizeof(v));
 
+//! \relatesalso PIByteArray \brief Store operator
+inline PIByteArray & operator <<(PIByteArray & s, const bool v) {s.push_back(v); return s;}
 
 //! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, bool v) {s.push_back(v); return s;}
+inline PIByteArray & operator <<(PIByteArray & s, const char v) {s.push_back(v); return s;}
+
 //! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, char v) {s.push_back(v); return s;}
+inline PIByteArray & operator <<(PIByteArray & s, const uchar v) {s.push_back(v); return s;}
+
 //! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, uchar v) {s.push_back(v); return s;}
+inline PIByteArray & operator <<(PIByteArray & s, const PIChar & v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
+
-inline PIByteArray & operator <<(PIByteArray & s, const short v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const int v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const long & v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const llong & v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const ushort v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const uint v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const ulong & v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const ullong & v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const float v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const double & v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const ldouble & v) {PBA_OPERATOR_TO return s;}
 //! \relatesalso PIByteArray \brief Store operator
 template<typename T> inline PIByteArray & operator <<(PIByteArray & s, const PIFlags<T> & v) {PBA_OPERATOR_TO return s;}
+
+//! \relatesalso PIByteArray \brief Store operator for any trivial copyable type
+template<typename T, typename std::enable_if< std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator <<(PIByteArray & s, const T & v) {PBA_OPERATOR_TO return s;}
+
 //! \relatesalso PIByteArray \brief Store operator, see \ref PIByteArray_sec1 for details
-inline PIByteArray & operator <<(PIByteArray & s, const PIByteArray & v) {s << int(v.size_s()); int os = s.size_s(); s.enlarge(v.size_s()); if (v.size_s() > 0) memcpy(s.data(os), v.data(), v.size()); return s;}
+inline PIByteArray & operator <<(PIByteArray & s, const PIByteArray & v) {
+	s << int(v.size_s());
+	int os = s.size_s();
+	if (v.size_s() > 0) {
+		s.enlarge(v.size_s());
+		memcpy(s.data(os), v.data(), v.size());
+	}
+	return s;
+}
+
 //! \relatesalso PIByteArray \brief Store operator, see \ref PIByteArray_sec1 for details
-inline PIByteArray & operator <<(PIByteArray & s, const PIByteArray::RawData & v) {int os = s.size_s(); s.enlarge(v.s); if (v.s > 0) memcpy(s.data(os), v.d, v.s); return s;}
+inline PIByteArray & operator <<(PIByteArray & s, const PIByteArray::RawData & v) {
+	int os = s.size_s();
+	if (v.s > 0) {
+		s.enlarge(v.s);
+		memcpy(s.data(os), v.d, v.s);
+	}
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Store operator for PIVector of any trivial copyable type
+template<typename T, typename std::enable_if< std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator <<(PIByteArray & s, const PIVector<T> & v) {
+	s << int(v.size_s());
+	int os = s.size_s();
+	if (v.size_s() > 0) {
+		s.enlarge(v.size_s()*sizeof(T));
+		memcpy(s.data(os), v.data(), v.size_s()*sizeof(T));
+	}
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Store operator for PIDeque of any trivial copyable type
+template<typename T, typename std::enable_if< std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator <<(PIByteArray & s, const PIDeque<T> & v) {
+	s << int(v.size_s());
+	int os = s.size_s();
+	if (v.size_s() > 0) {
+		s.enlarge(v.size_s()*sizeof(T));
+		memcpy(s.data(os), v.data(), v.size_s()*sizeof(T));
+	}
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Store operator for PIVector2D of any trivial copyable type
+template<typename T, typename std::enable_if< std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator <<(PIByteArray & s, const PIVector2D<T> & v) {
+	s << int(v.rows()) << int(v.cols());
+	int os = s.size_s();
+	if (v.size_s() > 0) {
+		s.enlarge(v.size_s()*sizeof(T));
+		memcpy(s.data(os), v.data(), v.size_s()*sizeof(T));
+	}
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Store operator
+inline PIByteArray & operator <<(PIByteArray & s, const PIBitArray & v) {s << v.size_ << v.data_; return s;}
+
+//! \relatesalso PIPair \brief Store operator
+template<typename Type0, typename Type1>
+inline PIByteArray & operator <<(PIByteArray & s, const PIPair<Type0, Type1> & v) {s << v.first << v.second; return s;}
 
 #undef PBA_OPERATOR_TO
+
+
+
+
+// restore operators for basic types
+
+
 #define PBA_OPERATOR_FROM memcpy((void*)(&v), s.data(), sizeof(v)); s.remove(0, sizeof(v));
 
 //! \relatesalso PIByteArray \brief Restore operator
 inline PIByteArray & operator >>(PIByteArray & s, bool & v) {assert(s.size() >= 1u); v = s.take_front(); return s;}
+
 //! \relatesalso PIByteArray \brief Restore operator
 inline PIByteArray & operator >>(PIByteArray & s, char & v) {assert(s.size() >= 1u); v = s.take_front(); return s;}
+
 //! \relatesalso PIByteArray \brief Restore operator
 inline PIByteArray & operator >>(PIByteArray & s, uchar & v) {assert(s.size() >= 1u); v = s.take_front(); return s;}
+
 //! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, short & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIChar & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
+
-inline PIByteArray & operator >>(PIByteArray & s, int & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
+//! \relatesalso PIByteArray \brief Restore operator for any trivial copyable type
-//! \relatesalso PIByteArray \brief Restore operator
+template<typename T, typename std::enable_if< std::is_trivially_copyable<T>::value, int>::type = 0>
-inline PIByteArray & operator >>(PIByteArray & s, long & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
+inline PIByteArray & operator >>(PIByteArray & s, T & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
+
-inline PIByteArray & operator >>(PIByteArray & s, llong & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, ushort & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, uint & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, ulong & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, ullong & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, float & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, double & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, ldouble & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
 //! \relatesalso PIByteArray \brief Restore operator
 template<typename T> inline PIByteArray & operator >>(PIByteArray & s, PIFlags<T> & v) {PBA_OPERATOR_FROM return s;}
+
 //! \relatesalso PIByteArray \brief Restore operator, see \ref PIByteArray_sec1 for details
 PIP_EXPORT PIByteArray & operator >>(PIByteArray & s, PIByteArray & v);
+
 //! \relatesalso PIByteArray \brief Restore operator, see \ref PIByteArray_sec1 for details
-inline PIByteArray & operator >>(PIByteArray & s, PIByteArray::RawData v) {assert(s.size_s() >= v.s); if (v.s > 0) memcpy((void*)(v.d), s.data(), v.s); s.remove(0, v.s); return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIByteArray::RawData v) {
+	assert(s.size_s() >= v.s);
+	if (v.s > 0) {
+		memcpy((void*)(v.d), s.data(), v.s);
+		s.remove(0, v.s);
+	}
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Restore operator for PIVector of any trivial copyable type
+template<typename T, typename std::enable_if< std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator >>(PIByteArray & s, PIVector<T> & v) {
+	assert(s.size_s() >= 4);
+	int sz; s >> sz;
+	v._resizeRaw(sz);
+	if (sz > 0) {
+		memcpy(v.data(), s.data(), sz*sizeof(T));
+		s.remove(0, sz*sizeof(T));
+	}
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Restore operator for PIDeque of any trivial copyable type
+template<typename T, typename std::enable_if< std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator >>(PIByteArray & s, PIDeque<T> & v) {
+	assert(s.size_s() >= 4);
+	int sz; s >> sz;
+	v._resizeRaw(sz);
+	if (sz > 0) {
+		memcpy(v.data(), s.data(), sz*sizeof(T));
+		s.remove(0, sz*sizeof(T));
+	}
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Restore operator for PIVector2D of any trivial copyable type
+template<typename T, typename std::enable_if< std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator >>(PIByteArray & s, PIVector2D<T> & v) {
+	assert(s.size_s() >= 8);
+	int r, c; s >> r >> c;
+	v._resizeRaw(r, c);
+	int sz = r*c;
+	if (sz > 0) {
+		memcpy(v.data(), s.data(), sz*sizeof(T));
+		s.remove(0, sz*sizeof(T));
+	}
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Restore operator
+inline PIByteArray & operator >>(PIByteArray & s, PIBitArray & v) {assert(s.size_s() >= 8); s >> v.size_ >> v.data_; return s;}
+
+//! \relatesalso PIPair \brief Restore operator
+template<typename Type0, typename Type1>
+inline PIByteArray & operator >>(PIByteArray & s, PIPair<Type0, Type1> & v) {s >> v.first >> v.second; return s;}
 
 #undef PBA_OPERATOR_FROM
 
-template<typename Type0, typename Type1> inline PIByteArray & operator <<(PIByteArray & s, const PIPair<Type0, Type1> & v);
-//! \relatesalso PIByteArray \brief Store operator
-template<typename T> inline PIByteArray & operator <<(PIByteArray & s, const PIVector<T> & v);
-//! \relatesalso PIByteArray \brief Store operator
-template<typename T> inline PIByteArray & operator <<(PIByteArray & s, const PIDeque<T> & v);
- //! \relatesalso PIByteArray \brief Store operator
-template <typename Key, typename T> inline PIByteArray & operator <<(PIByteArray & s, const PIMap<Key, T> & v);
-//! Write operator to \c PIByteArray
-inline PIByteArray & operator <<(PIByteArray & s, const PIChar & v) {s << v.ch; return s;}
-
-//! \relatesalso PIByteArray \brief Restore operator
-template<typename Type0, typename Type1> inline PIByteArray & operator >>(PIByteArray & s, PIPair<Type0, Type1> & v);
-//! \relatesalso PIByteArray \brief Restore operator
-template<typename T> inline PIByteArray & operator >>(PIByteArray & s, PIVector<T> & v);
-//! \relatesalso PIByteArray \brief Restore operator
-template<typename T> inline PIByteArray & operator >>(PIByteArray & s, PIDeque<T> & v);
- //! \relatesalso PIByteArray \brief Restore operator
-template <typename Key, typename T> inline PIByteArray & operator >>(PIByteArray & s, PIMap<Key, T> & v);
-//! Read operator from \c PIByteArray
-inline PIByteArray & operator >>(PIByteArray & s, PIChar & v) {s >> v.ch; return s;}
 
 
-//! \relatesalso PIByteArray \brief Store operator
+
-inline PIByteArray & operator <<(PIByteArray & s, const PIBitArray & v) {s << v.size_ << v.data_; return s;}
+// store operators for complex types
-template<typename Type0, typename Type1>
+
-inline PIByteArray & operator <<(PIByteArray & s, const PIPair<Type0, Type1> & v) {s << v.first << v.second; return s;}
+
-template<typename T>
+//! \relatesalso PIByteArray \brief Store operator for PIVector of any non-trivial copyable type
-inline PIByteArray & operator <<(PIByteArray & s, const PIVector<T> & v) {s << int(v.size_s()); for (uint i = 0; i < v.size(); ++i) s << v[i]; return s;}
+template<typename T, typename std::enable_if<!std::is_trivially_copyable<T>::value, int>::type = 0>
-template<typename T>
+inline PIByteArray & operator <<(PIByteArray & s, const PIVector<T> & v) {
-inline PIByteArray & operator <<(PIByteArray & s, const PIDeque<T> & v) {s << int(v.size_s()); for (uint i = 0; i < v.size(); ++i) s << v[i]; return s;}
+	s << int(v.size_s());
+	for (uint i = 0; i < v.size(); ++i) s << v[i];
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Store operator for PIDeque of any non-trivial copyable type
+template<typename T, typename std::enable_if<!std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator <<(PIByteArray & s, const PIDeque<T> & v) {
+	s << int(v.size_s());
+	for (uint i = 0; i < v.size(); ++i) s << v[i];
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Store operator for PIVector2D of any non-trivial copyable type
+template<typename T, typename std::enable_if<!std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator <<(PIByteArray & s, const PIVector2D<T> & v) {
+	s << int(v.rows()) << int(v.cols()) << v.toPlainVector();
+	return s;
+}
+
+
+
+
+// restore operators for complex types
+
+
+//! \relatesalso PIByteArray \brief Restore operator for PIVector of any non-trivial copyable type
+template<typename T, typename std::enable_if<!std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator >>(PIByteArray & s, PIVector<T> & v) {
+	assert(s.size_s() >= 4);
+	int sz; s >> sz;
+	v.resize(sz);
+	for (int i = 0; i < sz; ++i) s >> v[i];
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Restore operator for PIDeque of any non-trivial copyable type
+template<typename T, typename std::enable_if<!std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator >>(PIByteArray & s, PIDeque<T> & v) {
+	assert(s.size_s() >= 4);
+	int sz; s >> sz;
+	v.resize(sz);
+	for (int i = 0; i < sz; ++i) s >> v[i];
+	return s;
+}
+
+//! \relatesalso PIByteArray \brief Restore operator for PIVector2D of any non-trivial copyable type
+template<typename T, typename std::enable_if<!std::is_trivially_copyable<T>::value, int>::type = 0>
+inline PIByteArray & operator >>(PIByteArray & s, PIVector2D<T> & v) {
+	assert(s.size_s() >= 8);
+	int r,c;
+	PIVector<T> tmp;
+	s >> r >> c >> tmp;
+	v = PIVector2D<T>(r, c, tmp);
+	return s;
+}
+
+
+
+
+// other types
+
+
 template <typename Key, typename T>
 inline PIByteArray & operator <<(PIByteArray & s, const PIMap<Key, T> & v) {
 	s << int(v.pim_index.size_s());
@@ -263,18 +422,8 @@ inline PIByteArray & operator <<(PIByteArray & s, const PIMap<Key, T> & v) {
 	s << v.pim_content;
 	return s;
 }
-template<typename T>
-inline PIByteArray & operator <<(PIByteArray & s, const PIVector2D<T> & v) {s << int(v.rows()) << int(v.cols()) << v.toPlainVector(); return s;}
 
 
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, PIBitArray & v) {assert(s.size_s() >= 8); s >> v.size_ >> v.data_; return s;}
-template<typename Type0, typename Type1>
-inline PIByteArray & operator >>(PIByteArray & s, PIPair<Type0, Type1> & v) {s >> v.first >> v.second; return s;}
-template<typename T>
-inline PIByteArray & operator >>(PIByteArray & s, PIVector<T> & v) {assert(s.size_s() >= 4); int sz; s >> sz; v.resize(sz); for (int i = 0; i < sz; ++i) s >> v[i]; return s;}
-template<typename T>
-inline PIByteArray & operator >>(PIByteArray & s, PIDeque<T> & v) {assert(s.size_s() >= 4); int sz; s >> sz; v.resize(sz); for (int i = 0; i < sz; ++i) s >> v[i]; return s;}
 template <typename Key, typename T>
 inline PIByteArray & operator >>(PIByteArray & s, PIMap<Key, T> & v) {
 	assert(s.size_s() >= 4);
@@ -291,21 +440,15 @@ inline PIByteArray & operator >>(PIByteArray & s, PIMap<Key, T> & v) {
 	}
 	return s;
 }
-template<typename T>
-inline PIByteArray & operator >>(PIByteArray & s, PIVector2D<T> & v) {assert(s.size_s() >= 8); int r,c; PIVector<T> tmp; s >> r >> c >> tmp; v = PIVector2D<T>(r, c, tmp); return s;}
 
 
-template<typename T>
+
+template<typename T, typename std::enable_if<!std::is_trivially_copyable<T>::value, int>::type = 0>
 inline PIByteArray & operator <<(PIByteArray & s, const T & ) {piCout << "[PIByteArray] Warning: using undeclared operator <<!"; return s;}
-template<typename T>
+template<typename T, typename std::enable_if<!std::is_trivially_copyable<T>::value, int>::type = 0>
 inline PIByteArray & operator >>(PIByteArray & s, T & ) {piCout << "[PIByteArray] Warning: using undeclared operator >>!"; return s;}
 
-
+/*
-//! \relatesalso PIByteArray \brief Byte arrays compare operator
-inline bool operator ==(PIByteArray & f, PIByteArray & s) {if (f.size_s() != s.size_s()) return false; for (int i = 0; i < f.size_s(); ++i) if (f[i] != s[i]) return false; return true;}
-//! \relatesalso PIByteArray \brief Byte arrays compare operator
-inline bool operator !=(PIByteArray & f, PIByteArray & s) {if (f.size_s() != s.size_s()) return true; for (int i = 0; i < f.size_s(); ++i) if (f[i] != s[i]) return true; return false;}
-
 __PIBYTEARRAY_SIMPLE_TYPE__(bool)
 __PIBYTEARRAY_SIMPLE_TYPE__(char)
 __PIBYTEARRAY_SIMPLE_TYPE__(short)
@@ -320,7 +463,7 @@ __PIBYTEARRAY_SIMPLE_TYPE__(float)
 __PIBYTEARRAY_SIMPLE_TYPE__(double)
 __PIBYTEARRAY_SIMPLE_TYPE__(ldouble)
 __PIBYTEARRAY_SIMPLE_TYPE__(PIChar)
-
+*/
 
 template<> inline uint piHash(const PIByteArray & ba) {return ba.hash();}
 template<> inline void piSwap(PIByteArray & f, PIByteArray & s) {f.swap(s);}

libs/main/core/pichar.h

@@ -34,7 +34,7 @@ class PIP_EXPORT PIChar
 	friend class PIString;
 	friend PIByteArray & operator <<(PIByteArray & s, const PIChar & v);
 	friend PIByteArray & operator >>(PIByteArray & s, PIChar & v);
-	friend PICout operator <<(PICout s, const PIChar & v);
+	friend PICout PIP_EXPORT operator <<(PICout s, const PIChar & v);
 public:
 	//! Contructs ascii symbol
 	PIChar(const char c) {ch = c; ch &= 0xFF;}
@@ -135,7 +135,7 @@ private:
 };
 
 //! Output operator to \a PICout
-PICout operator <<(PICout s, const PIChar & v);
+PICout PIP_EXPORT operator <<(PICout s, const PIChar & v);
 
 //! Compare operator
 inline bool operator ==(const char v, const PIChar & c) {return (PIChar(v) == c);}

libs/main/math/pimathcomplex.h

@@ -46,13 +46,13 @@ const complexd complexd_1(1.);
 const complexld complexld_i(0., 1.);
 const complexld complexld_0(0.);
 const complexld complexld_1(1.);
-
+/*
 __PIBYTEARRAY_SIMPLE_TYPE__(complexi)
 __PIBYTEARRAY_SIMPLE_TYPE__(complexs)
 __PIBYTEARRAY_SIMPLE_TYPE__(complexf)
 __PIBYTEARRAY_SIMPLE_TYPE__(complexd)
 __PIBYTEARRAY_SIMPLE_TYPE__(complexld)
-
+*/
 inline complexd sign(const complexd & x) {return complexd(sign(x.real()), sign(x.imag()));}
 
 inline complexd round(const complexd & c) {return complexd(piRound<double>(c.real()), piRound<double>(c.imag()));}

main.cpp

@@ -2,31 +2,27 @@
 
 struct A {
 	double x1;
-	//double x2;
+	//PIString str;
 };
-inline PIByteArray & operator <<(PIByteArray & s, const A & a) {s << a.x1/* << a.x2*/; return s;}
+//inline PIByteArray & operator <<(PIByteArray & s, const A & a) {s << a.x1/* << a.x2*/; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, A & a) {s >> a.x1/* >> a.x2*/; return s;}
+//inline PIByteArray & operator >>(PIByteArray & s, A & a) {s >> a.x1/* >> a.x2*/; return s;}
 
 struct B {
 	B() {
 		x1=0;
-		//x2=0;
 	}
 	B(const B & b) = default;
-	B & operator =(const B & b) {x1=b.x1; return *this;}
+	//B & operator =(const B & b) {x1=b.x1; return *this;}
+	//A aa;
 	double x1;
-	//double x2;
 };
-inline PIByteArray & operator <<(PIByteArray & s, const B & a) {s << a.x1/* << a.x2*/; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, B & a) {s >> a.x1/* >> a.x2*/; return s;}
-
 //__PIVECTOR_SIMPLE_TYPE__(B)
 
 #include "piconditionvar.h"
 int main() {
-	PITimeMeasurer tm;
 	PIByteArray ba; ba.reserve(100*100*16);
 
+	PITimeMeasurer tm;
 	PIVector2D<double> vx;
 	PIVector2D<double> vd;
 	ba << vx;