merged concurrent to main library

removed PIConditionLock, use PIMutex instead

lib/main/core/picout.cpp

@@ -18,9 +18,9 @@
 */
 #include "piincludes_p.h"
 #include "picout.h"
-#include "piconsole.h"
 #include "pibytearray.h"
 #include "pistack.h"
+#include "piobject.h"
 #include "pistring_std.h"
 #ifdef WINDOWS
 #  include <windows.h>

lib/main/core/piincludes.cpp

@@ -19,7 +19,6 @@
 
 #include "piincludes.h"
 #include "piincludes_p.h"
-#include "piconsole.h"
 #include "pitime.h"
 #ifndef QNX
 #  include <clocale>

lib/main/core/piincludes.h

@@ -27,10 +27,9 @@
 #  include <iostream>
 #endif
 #include <atomic>
-#include <mutex>
 
-typedef std::mutex PIMutex;
-//typedef std::lock_guard<std::mutex> PIMutexLocker;
+class PIMutex;
+class PIMutexLocker;
 class PIObject;
 class PIString;
 class PIByteArray;

lib/main/core/pistring.h

@@ -51,6 +51,8 @@ public:
 
 	PIString(const PIString & o): PIDeque<PIChar>() {*this += o;}
 
+	PIString(PIString && o): PIDeque<PIChar>() {swap(o);}
+
 	
 	//! Contructs string with single symbol "c"
 	PIString(const PIChar & c): PIDeque<PIChar>() {*this += c;}
@@ -89,6 +91,8 @@ public:
 
 	PIString & operator =(const PIString & o) {if (this == &o) return *this; clear(); *this += o; return *this;}
 
+	PIString & operator =(PIString && o) {if (this == &o) return *this; swap(o); return *this;}
+
 	/*! \brief Return c-string representation of string
 	 * \details Converts content of string to c-string and return
 	 * pointer to first char. This buffer is valid until new convertion

lib/main/core/pistringlist.h

@@ -83,6 +83,7 @@ public:
 	PIStringList & operator =(const PIStringList & o) {PIDeque<PIString>::operator=(o); return *this;}
 
 	PIStringList & operator <<(const PIString & str) {append(str); return *this;}
+	PIStringList & operator <<(PIString && str) {append(str); return *this;}
 	PIStringList & operator <<(const PIStringList & sl) {append(sl); return *this;}
 
 };