git-svn-id: svn://db.shs.com.ru/pip@369 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

src/containers/picontainers.h

@@ -27,7 +27,7 @@
 #define PICONTAINERS_H
 
 #include "picout.h"
-
+#include <cassert>
 #include <malloc.h>
 #ifndef PIP_MEMALIGN_BYTES
 #  define PIP_MEMALIGN_BYTES (sizeof(void*)*4)

src/containers/pivector.h

@@ -71,7 +71,7 @@ public:
 		oj = (other.piv_size != 0 && other.piv_data == 0);// || (other.piv_size == 0 && other.piv_data != 0);
 		//printf("operator= (%p = %p) (s=%d, d=%p,  o.s=%d, o.d=%p) (%d, %d) ... o[\n", this, &other, int(piv_size), piv_data, int(other.piv_size), other.piv_data, int(tj), int(oj));
 		if (tj) {
-			printf("JUNK this\n");
+			//printf("JUNK this\n");
 			_reset();
 		} else {
 			clear();
@@ -88,7 +88,7 @@ public:
 			for (size_t i = 0; i < piv_size; ++i)
 				elementNew(piv_data + i, other.piv_data[i]); //piv_data[i] = other.piv_data[i];
 		} else {
-			printf("JUNK other\n");
+			//printf("JUNK other\n");
 		}
 		//printf("o]\n");
 		return *this;

src/core/pichar.cpp

@@ -21,6 +21,7 @@
 */
 
 #include <iostream>
+#include <string.h>
 #include "pibytearray.h"
 #ifdef PIP_ICU
 #  include "unicode/ucnv.h"

src/core/piincludes.h

@@ -23,19 +23,7 @@
 #include "pibase.h"
 #include "piflags.h"
 #include "pimonitor.h"
-
-//#include <iostream>
-//#include <stdlib.h>
-#include <cassert>
-#include <string.h>
-#include <stdio.h>
-//#include <string>
-/*#ifndef QNX
-#  include <cstdio>
-#  include <cstdlib>
-#else
-#  include <stdio.h>
-#endif*/
+#include <iosfwd>
 
 
 extern PIMonitor piMonitor;
@@ -47,7 +35,6 @@ class PIByteArray;
 class PIInit;
 class PIChar;
 class PICout;
-#include <iosfwd>
 
 struct lconv;
 

src/core/pistring.cpp

@@ -19,6 +19,7 @@
 
 #include "pistring.h"
 #include <iostream>
+#include <string.h>
 #ifdef PIP_ICU
 #  include "unicode/ucnv.h"
 #endif

src/piversion.h

@@ -4,7 +4,7 @@
 
 #define PIP_VERSION_MAJOR      0
 #define PIP_VERSION_MINOR      9
-#define PIP_VERSION_REVISION   1
+#define PIP_VERSION_REVISION   2
 #define PIP_VERSION_SUFFIX     ""
 
 #endif // PIVERSION_H