openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

bonnie++ does not compile with gcc >= 11 because it hits an ambiguity over

Browse Source 
the data vector:
	bon_csv2html.cpp: error: reference to 'data' is ambiguous

Similar fixes in almost all linux repos that ship bonnie++
Yuck and OK tb@
This commit is contained in:
claudio
2025-11-17 15:30:51 +00:00
parent a2d092419f
commit c8706c96e1
1 changed files with 178 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
benchmarks/bonnie++/patches/patch-bon_csv2html_cpp
+178
View File
@@ -0,0 +1,178 @@
With gcc >= 11: bon_csv2html.cpp: error: reference to 'data' is ambiguous
Index: bon_csv2html.cpp
--- bon_csv2html.cpp.orig
+++ bon_csv2html.cpp
@@ -10,7 +10,7 @@
using namespace std;
typedef vector<PCCHAR> STR_VEC;
-vector<STR_VEC> data;
+vector<STR_VEC> stddata;
typedef PCCHAR * PPCCHAR;
PPCCHAR * props;
@@ -84,8 +84,8 @@ int main(int argc, char **argv)
read_in(buf);
}
- props = new PPCCHAR[data.size()];
- for(i = 0; i < data.size(); i++)
+ props = new PPCCHAR[stddata.size()];
+ for(i = 0; i < stddata.size(); i++)
{
props[i] = new PCCHAR[MAX_ITEMS];
props[i][0] = NULL;
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
}
calc_vals();
int mid_width = header();
- for(i = 0; i < data.size(); i++)
+ for(i = 0; i < stddata.size(); i++)
{
// First print the average speed line
printf("<tr>");
@@ -168,23 +168,23 @@ int compar(const void *a, const void *b)
void calc_vals()
{
- ITEM *arr = new ITEM[data.size()];
+ ITEM *arr = new ITEM[stddata.size()];
for(unsigned int column_ind = 0; column_ind < MAX_ITEMS; column_ind++)
{
switch(vals[column_ind])
{
case eNoCols:
{
- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
+ for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
{
if(column_ind == COL_CONCURRENCY)
{
- if(data[row_ind][column_ind] && strcmp("1", data[row_ind][column_ind]))
+ if(stddata[row_ind][column_ind] && strcmp("1", stddata[row_ind][column_ind]))
col_used[column_ind] = true;
}
else
{
- if(data[row_ind][column_ind] && strlen(data[row_ind][column_ind]))
+ if(stddata[row_ind][column_ind] && strlen(stddata[row_ind][column_ind]))
col_used[column_ind] = true;
}
}
@@ -192,22 +192,22 @@ void calc_vals()
break;
case eCPU:
{
- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
+ for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
{
double work, cpu;
arr[row_ind].val = 0.0;
- if(data[row_ind].size() > column_ind
- && sscanf(data[row_ind][column_ind - 1], "%lf", &work) == 1
- && sscanf(data[row_ind][column_ind], "%lf", &cpu) == 1)
+ if(stddata[row_ind].size() > column_ind
+ && sscanf(stddata[row_ind][column_ind - 1], "%lf", &work) == 1
+ && sscanf(stddata[row_ind][column_ind], "%lf", &cpu) == 1)
{
arr[row_ind].val = cpu / work;
}
arr[row_ind].pos = row_ind;
}
- qsort(arr, data.size(), sizeof(ITEM), compar);
+ qsort(arr, stddata.size(), sizeof(ITEM), compar);
int col_count = -1;
double min_col = -1.0, max_col = -1.0;
- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
+ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
{
// if item is different from previous or if the first row
// (sort_ind == 0) then increment col count
@@ -236,7 +236,7 @@ void calc_vals()
min_col /= mult;
}
double range_col = max_col - min_col;
- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
+ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
{
if(arr[sort_ind].col_ind > -1)
{
@@ -247,7 +247,7 @@ void calc_vals()
}
else
{
- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
+ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
{
if(vals[column_ind] == eLatency)
{
@@ -260,25 +260,25 @@ void calc_vals()
case eSpeed:
case eLatency:
{
- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
+ for(unsigned int row_ind = 0; row_ind < stddata.size(); row_ind++)
{
arr[row_ind].val = 0.0;
- if(data[row_ind].size() <= column_ind
- || sscanf(data[row_ind][column_ind], "%lf", &arr[row_ind].val) == 0)
+ if(stddata[row_ind].size() <= column_ind
+ || sscanf(stddata[row_ind][column_ind], "%lf", &arr[row_ind].val) == 0)
arr[row_ind].val = 0.0;
if(vals[column_ind] == eLatency && arr[row_ind].val != 0.0)
{
- if(strstr(data[row_ind][column_ind], "ms"))
+ if(strstr(stddata[row_ind][column_ind], "ms"))
arr[row_ind].val *= 1000.0;
- else if(!strstr(data[row_ind][column_ind], "us"))
+ else if(!strstr(stddata[row_ind][column_ind], "us"))
arr[row_ind].val *= 1000000.0; // is !us && !ms then secs!
}
arr[row_ind].pos = row_ind;
}
- qsort(arr, data.size(), sizeof(ITEM), compar);
+ qsort(arr, stddata.size(), sizeof(ITEM), compar);
int col_count = -1;
double min_col = -1.0, max_col = -1.0;
- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
+ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
{
// if item is different from previous or if the first row
// (sort_ind == 0) then increment col count
@@ -307,7 +307,7 @@ void calc_vals()
min_col /= mult;
}
double range_col = max_col - min_col;
- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
+ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
{
if(arr[sort_ind].col_ind > -1)
{
@@ -329,7 +329,7 @@ void calc_vals()
}
else
{
- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++)
+ for(unsigned int sort_ind = 0; sort_ind < stddata.size(); sort_ind++)
{
if(vals[column_ind] == eLatency)
{
@@ -478,14 +478,14 @@ void read_in(CPCCHAR buf)
free((void *)arr[0]);
return;
}
- data.push_back(arr);
+ stddata.push_back(arr);
}
void print_item(int num, int item, CPCCHAR extra)
{
PCCHAR line_data;
- if(int(data[num].size()) > item)
- line_data = data[num][item];
+ if(int(stddata[num].size()) > item)
+ line_data = stddata[num][item];
else
line_data = "";
printf("<td");