From 9c59a27999be2e17a8bbc5566575a3293cf34967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Sat, 15 Apr 2017 05:12:09 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@369
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src/containers/picontainers.h |  2 +-
 src/containers/pivector.h     |  4 ++--
 src/core/pichar.cpp           |  1 +
 src/core/piincludes.h         | 15 +--------------
 src/core/pistring.cpp         |  1 +
 src/piversion.h               |  2 +-
 6 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/containers/picontainers.h b/src/containers/picontainers.h
index d2098077..dc696a5c 100755
--- a/src/containers/picontainers.h
+++ b/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)
diff --git a/src/containers/pivector.h b/src/containers/pivector.h
index 2ee8c89d..14a8e1d7 100755
--- a/src/containers/pivector.h
+++ b/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;
diff --git a/src/core/pichar.cpp b/src/core/pichar.cpp
index b0ed07e7..d1d9c23c 100644
--- a/src/core/pichar.cpp
+++ b/src/core/pichar.cpp
@@ -21,6 +21,7 @@
 */
 
 #include <iostream>
+#include <string.h>
 #include "pibytearray.h"
 #ifdef PIP_ICU
 #  include "unicode/ucnv.h"
diff --git a/src/core/piincludes.h b/src/core/piincludes.h
index c1280f98..5c0e5483 100755
--- a/src/core/piincludes.h
+++ b/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;
 
diff --git a/src/core/pistring.cpp b/src/core/pistring.cpp
index 98620db0..c6eaa7ee 100755
--- a/src/core/pistring.cpp
+++ b/src/core/pistring.cpp
@@ -19,6 +19,7 @@
 
 #include "pistring.h"
 #include <iostream>
+#include <string.h>
 #ifdef PIP_ICU
 #  include "unicode/ucnv.h"
 #endif
diff --git a/src/piversion.h b/src/piversion.h
index 26785342..12fdb3d0 100644
--- a/src/piversion.h
+++ b/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