Репозитории ALT
S: | 2.0.0.11-alt2 |
5.1: | 0.9.6-alt5.M51.1 |
4.1: | 0.9.6-alt5.M41.1 |
4.0: | 0.9.6-alt5.M40.1 |
Группа :: Разработка/Прочее
Пакет: basic256
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: basic256-alt-fix-ambiguous-array.patch
Скачать
Скачать
diff --git a/basic256/trunk/Variables.cpp b/basic256/trunk/Variables.cpp
index 9daf800..d8e8bb1 100755
--- a/basic256/trunk/Variables.cpp
+++ b/basic256/trunk/Variables.cpp
@@ -166,7 +166,7 @@ void Variables::arraydimfloat(int varnum, int xdim, int ydim, bool redim)
int size = xdim * ydim;
if (size <= VARIABLE_MAXARRAYELEMENTS) {
if (size >= 1) {
- array *a = new array;
+ b_array *a = new b_array;
double *d = new double[size];
for (int j = 0; j < size; j++) {
if(j < redimsize) {
@@ -206,7 +206,7 @@ void Variables::arraydimstring(int varnum, int xdim, int ydim, bool redim)
int size = xdim * ydim;
if (size <= VARIABLE_MAXARRAYELEMENTS) {
if (size >= 1) {
- array *a = new array;
+ b_array *a = new b_array;
char **c = new char*[size];
for (int j = 0; j < size; j++) {
if(j < redimsize) {
diff --git a/basic256/trunk/Variables.h b/basic256/trunk/Variables.h
index d24b51c..d254402 100755
--- a/basic256/trunk/Variables.h
+++ b/basic256/trunk/Variables.h
@@ -15,7 +15,7 @@
#define VARIABLE_MAXARRAYELEMENTS 100000
-struct array
+typedef struct b_array
{
int xdim;
int ydim;
@@ -25,7 +25,7 @@ struct array
double *fdata;
char **sdata;
} data;
-};
+} b_array;
struct variable
@@ -34,7 +34,7 @@ struct variable
union {
char *string;
double floatval;
- array *arr;
+ b_array *arr;
} value;
};