Improved PIBlockingDeque constructors

- resolve creation from constant (see test construct_from_constant_is_max_size_eq_capacity)
- add tests for constructors

CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(pip)
-set(_PIP_MAJOR    2)
+set(_PIP_MAJOR    1)
-set(_PIP_MINOR    5)
+set(_PIP_MINOR    99)
-set(_PIP_REVISION 0)
+set(_PIP_REVISION 3)
-set(_PIP_SUFFIX   _beta)
+set(_PIP_SUFFIX   _prebeta)
 set(_PIP_COMPANY  SHS)
 set(_PIP_DOMAIN   org.SHS)
 
@@ -66,10 +66,10 @@ macro(pip_module NAME LIBS LABEL INCLUDES MSG)
 	set(HS)
 	set(PHS)
 	set(CRES)
-	file(GLOB_RECURSE CPPS "libs/${NAME}/*.cpp")
+	file(GLOB_RECURSE CPPS "lib/${NAME}/*.cpp")
-	file(GLOB_RECURSE HS   "libs/${NAME}/*.h")
+	file(GLOB_RECURSE HS   "lib/${NAME}/*.h")
-	file(GLOB_RECURSE PHS  "libs/${NAME}/*_p.h")
+	file(GLOB_RECURSE PHS  "lib/${NAME}/*_p.h")
-	file(GLOB_RECURSE RES  "libs/${NAME}/*conf.h")
+	file(GLOB_RECURSE RES  "lib/${NAME}/*conf.h")
 	list(REMOVE_ITEM HS "${PHS}")
 	list(APPEND HDRS ${HS})
 	list(APPEND PHDRS ${PHS})
@@ -112,6 +112,8 @@ macro(pip_module NAME LIBS LABEL INCLUDES MSG)
 	if (NOT "${INCLUDES}" STREQUAL "")
 		target_include_directories(${_target} PRIVATE ${INCLUDES})
 	endif()
+	generate_export_header(${_target})
+	list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/${_target}_export.h")
 	list(APPEND PIP_EXPORTS "${DEF_NAME}_EXPORT")
 	target_link_libraries(${_target} ${LINK_LIBS})
 	list(APPEND PIP_MODULES ${_target})
@@ -208,8 +210,8 @@ get_filename_component(C_COMPILER "${CMAKE_C_COMPILER}" NAME)
 
 
 # Main lib
-file(GLOB PIP_FOLDERS LIST_DIRECTORIES TRUE "${CMAKE_CURRENT_SOURCE_DIR}/libs/main/*")
+file(GLOB PIP_FOLDERS LIST_DIRECTORIES TRUE "${CMAKE_CURRENT_SOURCE_DIR}/lib/main/*")
-list(APPEND PIP_FOLDERS "${CMAKE_CURRENT_SOURCE_DIR}/libs/main")
+list(APPEND PIP_FOLDERS "${CMAKE_CURRENT_SOURCE_DIR}/lib/main")
 set(PIP_MAIN_FOLDERS)
 foreach(F ${PIP_FOLDERS})
 	if (IS_DIRECTORY "${F}")
@@ -382,15 +384,6 @@ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
 
 pip_module(main "${LIBS_MAIN}" "PIP main library" "" "")
 
-generate_export_header(pip)
-list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/pip_export.h")
-foreach(_m ${PIP_SRC_MODULES})
-	set_target_properties(pip PROPERTIES DEFINE_SYMBOL pip_${_m}_EXPORTS)
-	generate_export_header(pip BASE_NAME "pip_${_m}")
-	list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/pip_${_m}_export.h")
-endforeach()
-set_target_properties(pip PROPERTIES DEFINE_SYMBOL pip_EXPORTS)
-
 
 if (NOT CROSSTOOLS)
 	if (NOT PIP_FREERTOS)
@@ -469,11 +462,7 @@ if (NOT CROSSTOOLS)
 			if(${CMAKE_VERSION} VERSION_LESS "3.7.0")
 				target_link_libraries(_opencl_lib OpenCL)
 			endif()
-			set(_opencl_inc "${OpenCL_INCLUDE_DIRS}")
+			pip_module(opencl "${_opencl_lib}" "PIP OpenCL support" "" " (${OpenCL_VERSION_STRING})")
-			if(APPLE)
-				set(_opencl_inc "${OpenCL_INCLUDE_DIRS}/Headers")
-			endif()
-			pip_module(opencl "${_opencl_lib}" "PIP OpenCL support" "${_opencl_inc}" " (${OpenCL_VERSION_STRING})")
 		endif()
 
 
@@ -490,15 +479,15 @@ if (NOT CROSSTOOLS)
 		endif()
 		find_package(Lua QUIET)
 		if (LUA_FOUND)
-			pip_module(lua "LUA" "PIP Lua support" "${LUA_INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libs/lua/3rd" " (${LUA_VERSION_STRING})")
+			pip_module(lua "LUA" "PIP Lua support" "${LUA_INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/3rd" " (${LUA_VERSION_STRING})")
-			list(APPEND HDR_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/libs/lua/3rd/LuaBridge")
+			list(APPEND HDR_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/3rd/LuaBridge")
 		endif()
 		
 
 		# Test program
 		if(PIP_UTILS)
 			add_executable(pip_test "main.cpp")
-			target_link_libraries(pip_test pip pip_cloud)
+			target_link_libraries(pip_test pip)
 			if (LUA_FOUND)
 				target_link_libraries(pip_test pip_lua ${LUA_LIBRARIES})
 			endif()
@@ -535,6 +524,7 @@ if(LIB)
 	if(WIN32)
 		if(MINGW)
 			if (NOT CROSSTOOLS)
+				install(FILES ${HDRS} DESTINATION ${MINGW_INCLUDE}/pip)
 				install(FILES ${HDRS} DESTINATION ${MINGW_INCLUDE}/pip)
 				if(HDR_DIRS)
 					install(DIRECTORY ${HDR_DIRS} DESTINATION ${MINGW_INCLUDE}/pip)
@@ -622,7 +612,7 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 		set(DOXY_QHP_SECT_FILTER_ATTRS "\"PIP ${PIP_VERSION}\"")
 		set(DOXY_EXAMPLE_PATH "\"${CMAKE_CURRENT_SOURCE_DIR}/doc/examples\"")
 		set(DOXY_IMAGE_PATH   "\"${CMAKE_CURRENT_SOURCE_DIR}/doc/images\"")
-		set(DOXY_EXCLUDE      "\"${CMAKE_CURRENT_SOURCE_DIR}/libs/lua/3rd\"")
+		set(DOXY_EXCLUDE      "\"${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/3rd\"")
 		if(DOXYGEN_DOT_EXECUTABLE)
 			string(REPLACE "\\" "" _DOT_PATH "${DOXYGEN_DOT_PATH}")
 			set(DOXY_DOT_PATH    "\"${_DOT_PATH}\"")
@@ -633,7 +623,7 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 		foreach(F ${PIP_MAIN_FOLDERS})
 			list(APPEND DOXY_INPUT "\"${F}\"")
 		endforeach(F)
-		string(REPLACE ";" " " DOXY_INPUT "\"${CMAKE_CURRENT_SOURCE_DIR}/libs\"")
+		string(REPLACE ";" " " DOXY_INPUT "\"${CMAKE_CURRENT_SOURCE_DIR}/lib\"")
 		string(REPLACE ";" " " DOXY_INCLUDE_PATH "${DOXY_INPUT}")
 		string(REPLACE ";" " " DOXY_DEFINES "${PIP_EXPORTS};DOXYGEN;PIOBJECT;PIOBJECT_SUBCLASS")
 		add_documentation(doc doc/Doxyfile.in)
@@ -642,23 +632,6 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 endif()
 
 
-set(_max_len 0)
-foreach(_m ${PIP_SRC_MODULES})
-	string(LENGTH "${_m}" _clen)
-	if (_clen GREATER _max_len)
-		set(_max_len ${_clen})
-	endif()
-endforeach()
-macro(expand_to_length _out _str _len)
-	set(${_out} "${_str}")
-	while(TRUE)
-		string(LENGTH "${${_out}}" _clen)
-		if (_clen GREATER_EQUAL ${_len})
-			break()
-		endif()
-		string(APPEND ${_out} " ")
-	endwhile()
-endmacro()
 
 list(REMOVE_ITEM LIBS_STATUS ${PIP_MODULES})
 message("----------PIP----------")
@@ -684,8 +657,7 @@ endif()
 message("")
 message(" Modules:")
 foreach(_m ${PIP_SRC_MODULES})
-	expand_to_length(_m_e "${_m}" ${_max_len})
+	message("  ${_m}: ${PIP_MSG_${_m}}")
-	message("  ${_m_e}: ${PIP_MSG_${_m}}")
 endforeach()
 message("")
 if (PIP_TESTS_LIST)

cmake/DeployMacros.cmake

@@ -14,9 +14,7 @@ Create variable <target>_VERSION with full version name
 
 If OUTPUT then generate header <file> with
 version macros - <target>_VERSION_<NAME>
-Also create macro <target>_VERSION_NAME with full string version and
+Also create macro <target>_VERSION_NAME with full string version
-macro <target>_MAKE_VERSION(major, minor, revision) that returns
-byte-packed integer version.
 Attention: macro <target>_VERSION is byte-packed integer version!
 
 
@@ -167,12 +165,11 @@ set(_dt_delim "::")
 
 
 macro(set_version _T)
-	set(_VERSION_ 2) # macro version
+	set(_VERSION_ 1) # macro version
 	set(_name)
 	set(_is_name 1)
 	set(_is_out 0)
 	set(_out)
-	#message("set_version \"${_T}\"")
 	foreach(_i ${ARGN})
 		if (_is_out)
 			set(_is_out 0)
@@ -180,16 +177,13 @@ macro(set_version _T)
 		elseif ("x${_i}" STREQUAL "xOUTPUT")
 			set(_is_out 1)
 		elseif(_is_name)
-			#message("set_version component \"${_i}\"")
 			set(_is_name 0)
 			if (_i IN_LIST __version_names)
 			else()
 				message(FATAL_ERROR "Invalid version component \"${_i}\"!")
 			endif()
 			set(_name ${_i})
-			set(${_T}_VERSION_${_name})
 		else()
-			#message("set_version value \"${_name}\" = \"${_i}\"")
 			set(_is_name 1)
 			set(${_T}_VERSION_${_name} ${_i})
 		endif()
@@ -245,8 +239,7 @@ macro(set_version _T)
 #define ${_TN}_VERSION_BUILD    ${${_T}_VERSION_BUILD}
 #define ${_TN}_VERSION_SUFFIX   \"${${_T}_VERSION_SUFFIX}\"
 #define ${_TN}_VERSION_NAME     \"${${_T}_VERSION}\"
-#define ${_TN}_MAKE_VERSION(major, minor, revision)  ((major << 16) | (minor << 8) | revision)
+#define ${_TN}_VERSION ((${_TN}_VERSION_MAJOR << 16) | (${_TN}_VERSION_MINOR << 8) | ${_TN}_VERSION_REVISION)
-#define ${_TN}_VERSION  ${_TN}_MAKE_VERSION(${_TN}_VERSION_MAJOR, ${_TN}_VERSION_MINOR, ${_TN}_VERSION_REVISION)
 
 
 // Tools
@@ -663,8 +656,7 @@ macro(deploy_target _T)
 			set(_TARGET_OS "linux")
 		endif()
 		string(REPLACE "_" "-" _DEBNAME "${_T}")
-		set(_DEBVERSION "${${_T}_VERSION_MAJOR}.${${_T}_VERSION_MINOR}.${${_T}_VERSION_REVISION}${_build}${${_T}_VERSION_FULLSUFFIX}+${_TARGET_OS}")
+		string(REPLACE "_" "-" _DEBVERSION "${${_T}_VERSION}${_build}+${_TARGET_OS}")
-		string(REPLACE "_" "-" _DEBVERSION "${_DEBVERSION}")
 		string(TOLOWER "${_DEBNAME}" _DEBNAME)
 		set(_DEB_ARCH)
 		if("_${MY_ARCH}" STREQUAL "_arm64")

doc/examples/picontainers.cpp

@@ -49,9 +49,6 @@ PIVector<char> vec(4u, 'p');
 piForeachC (char i, vec)
 	cout << i << ", ";
 // p, p, p, p, 
-
-piCout << PIVector<int>({1, 2, 3});
-// 1, 2, 3
 //! [PIVector::PIVector]
 //! [PIVector::at_c]
 PIVector<int> vec;

lib/cloud/piccloudclient.cpp

@@ -17,33 +17,24 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "picloudclient.h"
+#include "piccloudclient.h"
 
 
-PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), eth(PIEthernet::TCP_Client) {
+PICloudClient::PICloudClient() {
 }
 
 
 PICloudClient::~PICloudClient() {
-	stop();
+
-	close();
 }
 
 
 bool PICloudClient::openDevice() {
-	return false;
+
 }
 
 
 bool PICloudClient::closeDevice() {
-	return false;
+
 }
 
-int PICloudClient::readDevice(void * read_to, int max_size) {
-	return eth.read(read_to, max_size);
-}
-
-
-int PICloudClient::writeDevice(const void * data, int max_size) {
-	return eth.write(data, max_size);
-}

lib/cloud/piccloudserver.cpp

@@ -0,0 +1,25 @@
+/*
+	PIP - Platform Independent Primitives
+	PICloud Server
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piccloudserver.h"
+
+
+PICloudServer::PICloudServer() {
+}
+

lib/cloud/piccloudtcp.cpp

@@ -17,26 +17,12 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "picloudtcp.h"
+#include "piccloudtcp.h"
 #include "picrypt.h"
-#include "pichunkstream.h"
-
 
 const char hash_def_key[] = "_picrypt_";
 
 
-PIByteArray & operator <<(PIByteArray & s, const PICloud::Header & v) {
+PICloudTCP::PICloudTCP() {
-	s << v.version << v.type << v.sname;
-	return s;
-}
-
-
-PIByteArray & operator >>(PIByteArray & s, PICloud::Header & v) {
-	s >> v.version >> v.type >> v.sname;
-	return s;
-}
-
-
-PICloud::TCP::TCP() {
 }
 

lib/main/cloud/piccloudclient.h

@@ -1,4 +1,4 @@
-/*! \file picloudclient.h
+/*! \file piccloudclient.h
  * \brief PICloud Client
 */
 /*
@@ -20,11 +20,13 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef PICLOUDCLIENT_H
+#ifndef PICCLOUDCLIENT_H
-#define PICLOUDCLIENT_H
+#define PICCLOUDCLIENT_H
 
 #include "pip_cloud_export.h"
-#include "piethernet.h"
+#include "piiodevice.h"
+
+class PIEthernet;
 
 
 class PIP_CLOUD_EXPORT PICloudClient : public PIIODevice
@@ -32,7 +34,7 @@ class PIP_CLOUD_EXPORT PICloudClient : public PIIODevice
 	PIIODEVICE(PICloudClient)
 public:
 	//!
-	explicit PICloudClient(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
+	explicit PICloudClient();
 	virtual ~PICloudClient();
 
 protected:
@@ -40,10 +42,7 @@ protected:
 	bool closeDevice();
 
 private:
-	int readDevice(void * read_to, int max_size);
+	PIEthernet * eth;
-	int writeDevice(const void * data, int max_size);
-
-	PIEthernet eth;
 };
 
-#endif // PICLOUDCLIENT_H
+#endif // PICCLOUDCLIENT_H

lib/main/cloud/piccloudmodule.h

@@ -20,8 +20,8 @@
 #ifndef PICLOUDMODULE_H
 #define PICLOUDMODULE_H
 
-#include "picloudtcp.h"
+#include "piccloudtcp.h"
-#include "picloudclient.h"
+#include "piccloudclient.h"
-#include "picloudserver.h"
+#include "piccloudserver.h"
 
 #endif // PICLOUDMODULE_H

lib/main/cloud/piccloudserver.h

@@ -0,0 +1,40 @@
+/*! \file piccloudserver.h
+ * \brief PICloud Server
+*/
+/*
+	PIP - Platform Independent Primitives
+	PICloud Server
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICCLOUDSERVER_H
+#define PICCLOUDSERVER_H
+
+#include "pip_cloud_export.h"
+#include "piiodevice.h"
+
+
+class PIP_CLOUD_EXPORT PICloudServer {
+public:
+	//!
+	explicit PICloudServer();
+
+
+private:
+
+};
+
+#endif // PICCLOUDSERVER_H

lib/main/cloud/piccloudtcp.h

@@ -1,4 +1,4 @@
-/*! \file picloudtcp.h
+/*! \file piccloudtcp.h
  * \brief PICloud TCP transport
 */
 /*
@@ -20,45 +20,20 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef PICLOUDTCP_H
+#ifndef PICCLOUDTCP_H
-#define PICLOUDTCP_H
+#define PICCLOUDTCP_H
 
 #include "pip_cloud_export.h"
 #include "pistring.h"
 
-
+class PIP_CLOUD_EXPORT PICloudTCP {
-namespace PICloud {
-
-enum Version {
-	Version_1 = 1,
-};
-
-enum HeaderType {
-	Server = 1,
-	Client = 2,
-};
-
-struct PIP_CLOUD_EXPORT Header {
-	Header() {
-		version = Version_1;
-	}
-	uchar version; // PICloud::Version
-	uchar type; // PICloud::HeaderType
-	PIString sname; // server name
-};
-
-
-class PIP_CLOUD_EXPORT TCP {
 public:
-	TCP();
+	//!
+	PICloudTCP();
+
 
 private:
 
 };
 
-}
+#endif // PICCLOUDTCP_H
-
-PIP_CLOUD_EXPORT PIByteArray & operator <<(PIByteArray & s, const PICloud::Header & v);
-PIP_CLOUD_EXPORT PIByteArray & operator >>(PIByteArray & s, PICloud::Header & v);
-
-#endif // PICLOUDTCP_H

lib/main/containers/picontainers.cpp

@@ -32,10 +32,6 @@
  * \brief Contructs vector with size "size" filled elements "value"
  * \details Example: \snippet picontainers.cpp PIVector::PIVector
 
- * \fn PIVector::PIVector(std::initializer_list list);
- * \brief Contructs vector from C++11 initializer list
- * \details Example: \snippet picontainers.cpp PIVector::PIVector
-
  * \fn const T & PIVector::at(size_t index) const;
  * \brief Read-only access to element by index "index"
  * \details Example: \snippet picontainers.cpp PIVector::at_c
@@ -375,7 +371,4 @@
 * \fn bool PIMapIterator::next()
 * \brief Jump to next entry and return if new position is valid.
 
-* \fn void PIMapIterator::reset()
-* \brief Reset iterator to initial position.
-
  * */

lib/main/containers/picontainers.h

@@ -42,8 +42,6 @@
 #else
 #  include <malloc.h>
 #endif
-#include <initializer_list>
-#include <type_traits>
 #include <string.h>
 #include <new>
 #ifndef PIP_MEMALIGN_BYTES

lib/main/containers/pideque.h

@@ -39,11 +39,6 @@ public:
 		alloc(other.pid_size, true);
 		newT(pid_data + pid_start, other.pid_data + other.pid_start, pid_size);
 	}
-	inline PIDeque(std::initializer_list<T> init_list): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
-		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		alloc(init_list.size(), true);
-		newT(pid_data, init_list.begin(), init_list.size());
-	}
 	inline PIDeque(const T * data, size_t size): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		alloc(size, true);
@@ -54,7 +49,6 @@ public:
 		resize(pid_size, f);
 	}
 	inline PIDeque(PIDeque<T> && other): pid_data(other.pid_data), pid_size(other.pid_size), pid_rsize(other.pid_rsize), pid_start(other.pid_start) {
-		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		other._reset();
 	}
 	inline virtual ~PIDeque() {

lib/main/containers/pimap.h

@@ -364,13 +364,6 @@ public:
 		}
 		return false;
 	}
-	inline void reset() {
-		if (rev) {
-			pos = m.size_s();
-		} else {
-			pos = -1;
-		}
-	}
 private:
 	const MapType & m;
 	ssize_t pos;

lib/main/containers/pivector.h

@@ -44,17 +44,11 @@ public:
 		alloc(other.piv_size);
 		newT(piv_data, other.piv_data, piv_size);
 	}
-	inline PIVector(std::initializer_list<T> init_list): piv_data(0), piv_size(0), piv_rsize(0) {
-		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		alloc(init_list.size());
-		newT(piv_data, init_list.begin(), init_list.size());
-	}
 	inline PIVector(size_t piv_size, const T & f = T()): piv_data(0), piv_size(0), piv_rsize(0) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		resize(piv_size, f);
 	}
 	inline PIVector(PIVector<T> && other): piv_data(other.piv_data), piv_size(other.piv_size), piv_rsize(other.piv_rsize) {
-		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		other._reset();
 	}
 	inline virtual ~PIVector() {

lib/main/core/pibase.h

@@ -292,6 +292,13 @@ template<> inline void piSwapBinary(const void *& f, const void *& s) {
 	}
 }
 
+template<> inline void piSwap(double & f, double & s) {piSwapBinary<double>(f, s);}
+template<> inline void piSwap(ldouble & f, ldouble & s) {piSwapBinary<ldouble>(f, s);}
+#ifdef ARCH_BITS_32
+template<> inline void piSwap(float & f, float & s) {piSwapBinary<float>(f, s);}
+template<> inline void piSwap(llong & f, llong & s) {piSwapBinary<llong>(f, s);}
+template<> inline void piSwap(ullong & f, ullong & s) {piSwapBinary<ullong>(f, s);}
+#endif
 
 /*! \brief Function for compare two values without "=" by raw content
  * \details Example:\n \snippet piincludes.cpp compareBinary */
@@ -447,7 +454,20 @@ template<> inline float piLetobe(const float & v) {
 	return a.f;
 }
 
-/// \brief Generic hash function, implements murmur3/32 algorithm
+DEPRECATED inline ushort letobe_s(const ushort & v) {return (v << 8) | (v >> 8);}
+DEPRECATED inline uint letobe_i(const uint & v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
+
+#ifdef DOXYGEN
+
+/// \deprecated \brief Use \a piLetobe() instead of this function
+ushort letobe_s(ushort v) {return (v << 8) | (v >> 8);}
+
+/// \deprecated \brief Use \a piLetobe() instead of this function
+uint letobe_i(uint v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
+
+#endif
+
+/// \brief Generic hash function, impements murmur3/32 algorithm
 inline uint piHashData(const uchar * data, uint len, uint seed = 0) {
 	if (!data || len <= 0) return 0u;
 	uint h = seed;

lib/main/core/pibytearray.cpp

@@ -396,8 +396,8 @@ PIByteArray & operator >>(PIByteArray & s, PIByteArray & v) {
 	}
 	v.resize(sz);
 	if (sz > 0) {
-		memcpy(v.data(), s.data(), sz);
+		memcpy(v.data(), s.data(), v.size());
-		s.remove(0, sz);
+		s.remove(0, v.size());
 	}
 	return s;
 }

lib/main/core/pichunkstream.cpp

@@ -80,36 +80,11 @@ int PIChunkStream::read() {
 }
 
 
-int PIChunkStream::peekVInt(Version version_, PIByteArray * data_, int pos, PIByteArray & hdr, uint & ret) {
-	switch (version_) {
-	case Version_1:
-		memcpy(&ret, data_->data(pos), 4);
-		return 4;
-	case Version_2: {
-		hdr.resize(4);
-		hdr.fill(uchar(0));
-		memcpy(hdr.data(), data_->data(pos), piMini(4, data_->size_s() - pos));
-		uchar hsz = 0;
-		ret = readVInt(hdr, &hsz);
-		return hsz;
-		}
-	default: break;
-	}
-	return 0;
-}
-
-
 void PIChunkStream::readAll() {
 	data_map.clear();
-	if (!data_) return;
+	while (!atEnd()) {
-	int pos = 0, sz = data_->size_s();
+		read();
-	uint csz = 0, cid = 0;
+		data_map[last_id] = last_data;
-	PIByteArray hdr;
-	while (pos < sz) {
-		pos += peekVInt((Version)version_, data_, pos, hdr, cid);
-		pos += peekVInt((Version)version_, data_, pos, hdr, csz);
-		data_map[cid] = PIPair<int, int>(pos, csz);
-		pos += csz;
 	}
 }
 
@@ -136,7 +111,7 @@ void PIChunkStream::_init() {
 }
 
 
-uint PIChunkStream::readVInt(PIByteArray & s, uchar * bytes_cnt) {
+uint PIChunkStream::readVInt(PIByteArray & s) {
 	if (s.isEmpty()) return 0;
 	uchar bytes[4]; s >> bytes[0];
 	uchar abc = 0;
@@ -147,7 +122,6 @@ uint PIChunkStream::readVInt(PIByteArray & s, uchar * bytes_cnt) {
 			s >> bytes[abc + 1];
 		} else break;
 	}
-	if (bytes_cnt) *bytes_cnt = (abc + 1);
 	uint ret = 0;
 	for (int i = 0; i <= abc; ++i) {
 		ret += (bytes[i] << (8 * ((int)abc - i)));

lib/main/core/pichunkstream.h

@@ -83,7 +83,7 @@ public:
 	//! Read one chunk from stream and returns its ID
 	int read();
 
-	//! Read all chunks from stream. This function just index input data
+	//! Read all chunks from stream
 	void readAll();
 	
 	//! Returns last readed chunk ID
@@ -100,9 +100,7 @@ public:
 	//! Place value of chunk with id \"id\" into \"v\". You should call \a readAll() before using this function!
 	template <typename T>
 	const PIChunkStream & get(int id, T & v) const {
-		PIPair<int, int> pos = data_map.value(id);
+		PIByteArray ba = data_map.value(id);
-		if (pos.first < 0 || pos.second == 0) return *this;
-		PIByteArray ba(data_->data(pos.first), pos.second);
 		if (!ba.isEmpty())
 			ba >> v;
 		return *this;
@@ -111,14 +109,13 @@ public:
 private:
 	void _init();
 	
-	static uint readVInt(PIByteArray & s, uchar * bytes = 0);
+	static uint readVInt(PIByteArray & s);
 	static void writeVInt(PIByteArray & s, uint val);
-	static int peekVInt(Version version_, PIByteArray * data_, int pos, PIByteArray & hdr, uint & ret);
 
 	int last_id;
 	uchar version_;
 	PIByteArray * data_, last_data, tmp_data;
-	PIMap<int, PIPair<int, int>> data_map;
+	PIMap<int, PIByteArray> data_map;
 	
 	template <typename T> friend PIChunkStream & operator <<(PIChunkStream & s, const PIChunkStream::Chunk<T> & c);
 	template <typename T> friend PIChunkStream & operator <<(PIChunkStream & s, const PIChunkStream::ChunkConst<T> & c);

lib/main/core/pipropertystorage.cpp

@@ -38,16 +38,6 @@ void PIPropertyStorage::addProperty(const PIPropertyStorage::Property & p) {
 }
 
 
-void PIPropertyStorage::addProperty(PIPropertyStorage::Property && p) {
-	for (uint i = 0; i < props.size(); ++i)
-		if (props[i].name == p.name) {
-			props[i] = std::move(p);
-			return;
-		}
-	props << std::move(p);
-}
-
-
 void PIPropertyStorage::removeProperty(const PIString & _name) {
 	for (uint i = 0; i < props.size(); ++i)
 		if (props[i].name == _name) {