luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use C++11 feature std::tuple, instead use std::pair

This commit is contained in:
Purdea Andrei 2020-06-03 14:47:11 +03:00
parent 37da3c530c
commit 859341273e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.cc
View File

@ -598,7 +598,7 @@ bool had_timescale = false;
static void read_iconfig_file(const char*ipath) static void read_iconfig_file(const char*ipath)
{ {
char buf[8*1024]; char buf[8*1024];
vector<tuple<char*,bool>> to_build_library_index; vector<pair<char*,bool>> to_build_library_index;
FILE*ifile = fopen(ipath, "r"); FILE*ifile = fopen(ipath, "r");
if (ifile == 0) { if (ifile == 0) {
@ -757,10 +757,10 @@ static void read_iconfig_file(const char*ipath)
ignore_missing_modules = true; ignore_missing_modules = true;
} else if (strcmp(buf, "-y") == 0) { } else if (strcmp(buf, "-y") == 0) {
to_build_library_index.push_back(make_tuple(strdup(cp), CASE_SENSITIVE)); to_build_library_index.push_back(make_pair(strdup(cp), CASE_SENSITIVE));
} else if (strcmp(buf, "-yl") == 0) { } else if (strcmp(buf, "-yl") == 0) {
to_build_library_index.push_back(make_tuple(strdup(cp), false)); to_build_library_index.push_back(make_pair(strdup(cp), false));
} else if (strcmp(buf, "-Y") == 0) { } else if (strcmp(buf, "-Y") == 0) {
library_suff.push_back(strdup(cp)); library_suff.push_back(strdup(cp));
@ -799,7 +799,7 @@ static void read_iconfig_file(const char*ipath)
} }
} }
fclose(ifile); fclose(ifile);
for (vector<tuple<char *, bool>>::iterator it = to_build_library_index.begin() ; for (vector<pair<char *, bool>>::iterator it = to_build_library_index.begin() ;
it != to_build_library_index.end() ; ++ it ) { it != to_build_library_index.end() ; ++ it ) {
build_library_index(get<0>(*it), get<1>(*it)); build_library_index(get<0>(*it), get<1>(*it));
free(get<0>(*it)); free(get<0>(*it));