Fixed naming conflict

This commit is contained in:
Andrew S. Rightenburg 2023-08-24 09:17:37 -04:00
parent b32dba2e23
commit 6d53407e67
Signed by: rail5
GPG Key ID: A0CB570AB6629159
3 changed files with 7 additions and 7 deletions

View File

@ -168,9 +168,9 @@ void reader::file::do_regex_search() {
}
void reader::file::do_search_job() {
if (query_type == normal_search) {
if (query_type == t_normal_search) {
do_normal_search();
} else if (query_type == regex_search) {
} else if (query_type == t_regex_search) {
do_regex_search();
}
}

View File

@ -104,7 +104,7 @@ int main(int argc, char* argv[]) {
bool special_chars = false;
reader::search_type query_type = reader::normal_search;
reader::search_type query_type = reader::t_normal_search;
/*
GETOPT
@ -177,7 +177,7 @@ int main(int argc, char* argv[]) {
break;
case 'e':
query_type = reader::regex_search;
query_type = reader::t_regex_search;
break;
case 'V':

View File

@ -8,8 +8,8 @@ namespace reader {
};
enum search_type {
normal_search,
regex_search
t_normal_search,
t_regex_search
};
class file {
@ -29,7 +29,7 @@ namespace reader {
int block_size = 10240;
string search_query = "";
search_type query_type = normal_search;
search_type query_type = t_normal_search;
job_type job = read_job;