remove install duplicate

std::initializer_list supports for vector and dequeue

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    1)
-set(_PIP_MINOR    99)
-set(_PIP_REVISION 3)
-set(_PIP_SUFFIX   _prebeta)
+set(_PIP_MAJOR    2)
+set(_PIP_MINOR    2)
+set(_PIP_REVISION 2)
+set(_PIP_SUFFIX   _alpha)
 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 "lib/${NAME}/*.cpp")
-	file(GLOB_RECURSE HS   "lib/${NAME}/*.h")
-	file(GLOB_RECURSE PHS  "lib/${NAME}/*_p.h")
-	file(GLOB_RECURSE RES  "lib/${NAME}/*conf.h")
+	file(GLOB_RECURSE CPPS "libs/${NAME}/*.cpp")
+	file(GLOB_RECURSE HS   "libs/${NAME}/*.h")
+	file(GLOB_RECURSE PHS  "libs/${NAME}/*_p.h")
+	file(GLOB_RECURSE RES  "libs/${NAME}/*conf.h")
 	list(REMOVE_ITEM HS "${PHS}")
 	list(APPEND HDRS ${HS})
 	list(APPEND PHDRS ${PHS})
@@ -112,8 +112,6 @@ 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})
@@ -210,8 +208,8 @@ get_filename_component(C_COMPILER "${CMAKE_C_COMPILER}" NAME)
 
 
 # Main lib
-file(GLOB PIP_FOLDERS LIST_DIRECTORIES TRUE "${CMAKE_CURRENT_SOURCE_DIR}/lib/main/*")
-list(APPEND PIP_FOLDERS "${CMAKE_CURRENT_SOURCE_DIR}/lib/main")
+file(GLOB PIP_FOLDERS LIST_DIRECTORIES TRUE "${CMAKE_CURRENT_SOURCE_DIR}/libs/main/*")
+list(APPEND PIP_FOLDERS "${CMAKE_CURRENT_SOURCE_DIR}/libs/main")
 set(PIP_MAIN_FOLDERS)
 foreach(F ${PIP_FOLDERS})
 	if (IS_DIRECTORY "${F}")
@@ -384,6 +382,15 @@ 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)
@@ -462,7 +469,11 @@ if (NOT CROSSTOOLS)
 			if(${CMAKE_VERSION} VERSION_LESS "3.7.0")
 				target_link_libraries(_opencl_lib OpenCL)
 			endif()
-			pip_module(opencl "${_opencl_lib}" "PIP OpenCL support" "" " (${OpenCL_VERSION_STRING})")
+			set(_opencl_inc "${OpenCL_INCLUDE_DIRS}")
+			if(APPLE)
+				set(_opencl_inc "${OpenCL_INCLUDE_DIRS}/Headers")
+			endif()
+			pip_module(opencl "${_opencl_lib}" "PIP OpenCL support" "${_opencl_inc}" " (${OpenCL_VERSION_STRING})")
 		endif()
 
 
@@ -479,8 +490,8 @@ 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}/lib/lua/3rd" " (${LUA_VERSION_STRING})")
-			list(APPEND HDR_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/3rd/LuaBridge")
+			pip_module(lua "LUA" "PIP Lua support" "${LUA_INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libs/lua/3rd" " (${LUA_VERSION_STRING})")
+			list(APPEND HDR_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/libs/lua/3rd/LuaBridge")
 		endif()
 		
 
@@ -524,7 +535,6 @@ 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)
@@ -612,7 +622,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}/lib/lua/3rd\"")
+		set(DOXY_EXCLUDE      "\"${CMAKE_CURRENT_SOURCE_DIR}/libs/lua/3rd\"")
 		if(DOXYGEN_DOT_EXECUTABLE)
 			string(REPLACE "\\" "" _DOT_PATH "${DOXYGEN_DOT_PATH}")
 			set(DOXY_DOT_PATH    "\"${_DOT_PATH}\"")
@@ -623,7 +633,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}/lib\"")
+		string(REPLACE ";" " " DOXY_INPUT "\"${CMAKE_CURRENT_SOURCE_DIR}/libs\"")
 		string(REPLACE ";" " " DOXY_INCLUDE_PATH "${DOXY_INPUT}")
 		string(REPLACE ";" " " DOXY_DEFINES "${PIP_EXPORTS};DOXYGEN;PIOBJECT;PIOBJECT_SUBCLASS")
 		add_documentation(doc doc/Doxyfile.in)
@@ -632,6 +642,23 @@ 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----------")
@@ -657,7 +684,8 @@ endif()
 message("")
 message(" Modules:")
 foreach(_m ${PIP_SRC_MODULES})
-	message("  ${_m}: ${PIP_MSG_${_m}}")
+	expand_to_length(_m_e "${_m}" ${_max_len})
+	message("  ${_m_e}: ${PIP_MSG_${_m}}")
 endforeach()
 message("")
 if (PIP_TESTS_LIST)

cmake/DeployMacros.cmake

@@ -14,7 +14,9 @@ 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
+Also create macro <target>_VERSION_NAME with full string version and
+macro <target>_MAKE_VERSION(major, minor, revision) that returns
+byte-packed integer version.
 Attention: macro <target>_VERSION is byte-packed integer version!
 
 
@@ -165,7 +167,7 @@ set(_dt_delim "::")
 
 
 macro(set_version _T)
-	set(_VERSION_ 1) # macro version
+	set(_VERSION_ 2) # macro version
 	set(_name)
 	set(_is_name 1)
 	set(_is_out 0)
@@ -239,7 +241,8 @@ 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}_VERSION ((${_TN}_VERSION_MAJOR << 16) | (${_TN}_VERSION_MINOR << 8) | ${_TN}_VERSION_REVISION)
+#define ${_TN}_MAKE_VERSION(major, minor, revision)  ((major << 16) | (minor << 8) | revision)
+#define ${_TN}_VERSION  ${_TN}_MAKE_VERSION(${_TN}_VERSION_MAJOR, ${_TN}_VERSION_MINOR, ${_TN}_VERSION_REVISION)
 
 
 // Tools
@@ -656,7 +659,8 @@ macro(deploy_target _T)
 			set(_TARGET_OS "linux")
 		endif()
 		string(REPLACE "_" "-" _DEBNAME "${_T}")
-		string(REPLACE "_" "-" _DEBVERSION "${${_T}_VERSION}${_build}+${_TARGET_OS}")
+		set(_DEBVERSION "${${_T}_VERSION_MAJOR}.${${_T}_VERSION_MINOR}.${${_T}_VERSION_REVISION}${_build}${${_T}_VERSION_FULLSUFFIX}+${_TARGET_OS}")
+		string(REPLACE "_" "-" _DEBVERSION "${_DEBVERSION}")
 		string(TOLOWER "${_DEBNAME}" _DEBNAME)
 		set(_DEB_ARCH)
 		if("_${MY_ARCH}" STREQUAL "_arm64")

doc/examples/picontainers.cpp

@@ -49,6 +49,9 @@ 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/main/thread/piexecutor.h

@@ -1,200 +0,0 @@
-/*
-	PIP - Platform Independent Primitives
-	
-	Stephan Fomenko
-
-	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 PIEXECUTOR_H
-#define PIEXECUTOR_H
-
-#include "piblockingdequeue.h"
-#include <atomic>
-#include <future>
-
-/**
- * @brief Wrapper for custom invoke operator available function types.
- * @note Source from: "Энтони Уильямс, Параллельное программирование на С++ в действии. Практика разработки многопоточных
- * программ. Пер. с англ. Слинкин А. А. - M.: ДМК Пресс, 2012 - 672c.: ил." (page 387)
- */
-class FunctionWrapper {
-	struct ImplBase {
-		virtual void call() = 0;
-		virtual ~ImplBase() = default;
-	};
-
-	std::unique_ptr<ImplBase> impl;
-
-	template<typename F>
-	struct ImplType: ImplBase {
-		F f;
-		explicit ImplType(F&& f): f(std::forward<F>(f)) {}
-		void call() final { f(); }
-	};
-public:
-	template<typename F, typename = std::enable_if<!std::is_same<F, FunctionWrapper>::value> >
-	explicit FunctionWrapper(F&& f): impl(new ImplType<F>(std::forward<F>(f))) {}
-
-	void operator()() { impl->call(); }
-
-	explicit operator bool() const noexcept { return static_cast<bool>(impl); }
-
-	FunctionWrapper() = default;
-	FunctionWrapper(FunctionWrapper&& other) noexcept : impl(std::move(other.impl)) {}
-	FunctionWrapper& operator=(FunctionWrapper&& other) noexcept {
-		impl = std::move(other.impl);
-		return *this;
-	}
-
-	FunctionWrapper(const FunctionWrapper& other) = delete;
-	FunctionWrapper& operator=(const FunctionWrapper&) = delete;
-};
-
-template <typename Thread_ = PIThread, typename Dequeue_ = PIBlockingDequeue<FunctionWrapper>>
-class PIThreadPoolExecutorTemplate {
-public:
-	NO_COPY_CLASS(PIThreadPoolExecutorTemplate)
-	explicit PIThreadPoolExecutorTemplate(size_t corePoolSize = 1) : isShutdown_(false) { makePool(corePoolSize); }
-
-	virtual ~PIThreadPoolExecutorTemplate() {
-		shutdownNow();
-		while (threadPool.size() > 0) delete threadPool.take_back();
-	}
-
-	template<typename FunctionType>
-	std::future<typename std::result_of<FunctionType()>::type> submit(FunctionType&& callable) {
-		typedef typename std::result_of<FunctionType()>::type ResultType;
-
-		if (!isShutdown_) {
-			std::packaged_task<ResultType()> callable_task(std::forward<FunctionType>(callable));
-			auto future = callable_task.get_future();
-			FunctionWrapper functionWrapper(callable_task);
-			taskQueue.offer(std::move(functionWrapper));
-			return future;
-		} else {
-			return std::future<ResultType>();
-		}
-	}
-
-	template<typename FunctionType>
-	void execute(FunctionType&& runnable) {
-		if (!isShutdown_) {
-			FunctionWrapper function_wrapper(std::forward<FunctionType>(runnable));
-			taskQueue.offer(std::move(function_wrapper));
-		}
-	}
-
-	void shutdown() {
-		isShutdown_ = true;
-	}
-
-	void shutdownNow() {
-		isShutdown_ = true;
-		for (size_t i = 0; i < threadPool.size(); ++i) threadPool[i]->stop();
-	}
-
-	bool isShutdown() const {
-		return isShutdown_;
-	}
-
-	bool awaitTermination(int timeoutMs) {
-		PITimeMeasurer measurer;
-		for (size_t i = 0; i < threadPool.size(); ++i) {
-			int dif = timeoutMs - (int)measurer.elapsed_m();
-			if (dif < 0) return false;
-			if (!threadPool[i]->waitForFinish(dif)) return false;
-		}
-		return true;
-	}
-
-protected:
-	std::atomic_bool isShutdown_;
-	Dequeue_ taskQueue;
-	PIVector<Thread_*> threadPool;
-
-	template<typename Function>
-	PIThreadPoolExecutorTemplate(size_t corePoolSize, Function&& onBeforeStart) : isShutdown_(false) {
-		makePool(corePoolSize, std::forward<Function>(onBeforeStart));
-	}
-
-	void makePool(size_t corePoolSize, std::function<void(Thread_*)>&& onBeforeStart = [](Thread_*){}) {
-		for (size_t i = 0; i < corePoolSize; ++i) {
-			auto* thread = new Thread_([&, i](){
-				auto runnable = taskQueue.poll(100);
-				if (runnable) {
-					runnable();
-				}
-				if (isShutdown_ && taskQueue.size() == 0) threadPool[i]->stop();
-			});
-			threadPool.push_back(thread);
-			onBeforeStart(thread);
-			thread->start();
-		}
-	}
-};
-
-typedef PIThreadPoolExecutorTemplate<> PIThreadPoolExecutor;
-
-#ifdef DOXYGEN
-/**
- * @brief Thread pools address two different problems: they usually provide improved performance when executing large
- * numbers of asynchronous tasks, due to reduced per-task invocation overhead, and they provide a means of bounding and
- * managing the resources, including threads, consumed when executing a collection of tasks.
- */
-class PIThreadPoolExecutor {
-public:
-	explicit PIThreadPoolExecutor(size_t corePoolSize);
-
-	virtual ~PIThreadPoolExecutor();
-
-	/**
-	 * @brief Submits a Runnable task for execution and returns a Future representing that task. The Future's get method
-	 * will return null upon successful completion.
-	 *
-	 * @tparam FunctionType - custom type of function with operator() and return type
-	 * @tparam R - derived from FunctionType return type
-	 *
-	 * @param callable - the task to submit
-	 * @return a future representing pending completion of the task
-	 */
-	std::future<R> submit(FunctionType&& callable);
-
-	/**
-	 * @brief Executes the given task sometime in the future. The task execute in an existing pooled thread. If the task
-	 * cannot be submitted for execution, either because this executor has been shutdown or because its capacity has been
-	 * reached.
-	 *
-	 * @tparam FunctionType - custom type of function with operator() and return type
-	 *
-	 * @param runnable not empty function for thread pool execution
-	 */
-	void execute(FunctionType&& runnable);
-
-	/**
-	 * @brief Initiates an orderly shutdown in which previously submitted tasks are executed, but no new tasks will be
-	 * accepted. Invocation has no additional effect if already shut down. This method does not wait for previously
-	 * submitted tasks to complete execution. Use awaitTermination to do that.
-	 */
-	void shutdown();
-
-	void shutdownNow();
-
-	bool isShutdown() const;
-
-	bool awaitTermination(int timeoutMs);
-};
-#endif //DOXYGEN
-
-#endif //PIEXECUTOR_H

libs/cloud/piccloudclient.cpp

@@ -30,11 +30,11 @@ PICloudClient::~PICloudClient() {
 
 
 bool PICloudClient::openDevice() {
-
+	return false;
 }
 
 
 bool PICloudClient::closeDevice() {
-
+	return false;
 }
 

libs/main/containers/picontainers.cpp

@@ -32,6 +32,10 @@
  * \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
@@ -371,4 +375,7 @@
 * \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.
+
  * */

libs/main/containers/picontainers.h

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

libs/main/containers/pideque.h

@@ -39,6 +39,11 @@ 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);
@@ -49,6 +54,7 @@ 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() {

libs/main/containers/pimap.h

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

libs/main/containers/pivector.h

@@ -44,11 +44,17 @@ 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() {

libs/main/core/pibase.h

@@ -454,20 +454,7 @@ template<> inline float piLetobe(const float & v) {
 	return a.f;
 }
 
-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
+/// \brief Generic hash function, implements murmur3/32 algorithm
 inline uint piHashData(const uchar * data, uint len, uint seed = 0) {
 	if (!data || len <= 0) return 0u;
 	uint h = seed;

libs/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(), v.size());
-		s.remove(0, v.size());
+		memcpy(v.data(), s.data(), sz);
+		s.remove(0, sz);
 	}
 	return s;
 }