SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

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

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-15 05:12:09 +00:00
parent 364cba2733
commit 9c59a27999
6 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/containers/picontainers.h
View File

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

4
src/containers/pivector.h
View File

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

1
src/core/pichar.cpp
View File

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

15
src/core/piincludes.h
View File

@@ -23,19 +23,7 @@
#include "pibase.h" #include "pibase.h"
#include "piflags.h" #include "piflags.h"
#include "pimonitor.h" #include "pimonitor.h"
#include <iosfwd>
//#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*/
extern PIMonitor piMonitor; extern PIMonitor piMonitor;
@@ -47,7 +35,6 @@ class PIByteArray;
class PIInit; class PIInit;
class PIChar; class PIChar;
class PICout; class PICout;
#include <iosfwd>
struct lconv; struct lconv;

1
src/core/pistring.cpp
View File

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

2
src/piversion.h
View File

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