diff --git a/plugins/header_rewrite/header_rewrite_test.cc b/plugins/header_rewrite/header_rewrite_test.cc index cd032f2eba4..704c68d0a7c 100644 --- a/plugins/header_rewrite/header_rewrite_test.cc +++ b/plugins/header_rewrite/header_rewrite_test.cc @@ -69,10 +69,10 @@ class ParserTest : public Parser bool res; }; -class SimpleTokenizerTest : public SimpleTokenizer +class SimpleTokenizerTest : public HRWSimpleTokenizer { public: - SimpleTokenizerTest(const std::string &line) : SimpleTokenizer(line), res(true) + SimpleTokenizerTest(const std::string &line) : HRWSimpleTokenizer(line), res(true) { std::cout << "Finished tokenizer test: " << line << std::endl; } diff --git a/plugins/header_rewrite/parser.cc b/plugins/header_rewrite/parser.cc index 7e5e40e6fd1..cb6e2c5cf3c 100644 --- a/plugins/header_rewrite/parser.cc +++ b/plugins/header_rewrite/parser.cc @@ -248,7 +248,7 @@ Parser::cond_is_hook(TSHttpHookID &hook) const return false; } -SimpleTokenizer::SimpleTokenizer(const std::string &original_line) +HRWSimpleTokenizer::HRWSimpleTokenizer(const std::string &original_line) { std::string line = original_line; ParserState state = PARSER_DEFAULT; diff --git a/plugins/header_rewrite/parser.h b/plugins/header_rewrite/parser.h index 691a817b72b..4b3b468c037 100644 --- a/plugins/header_rewrite/parser.h +++ b/plugins/header_rewrite/parser.h @@ -99,14 +99,14 @@ class Parser std::vector _tokens; }; -class SimpleTokenizer +class HRWSimpleTokenizer { public: - explicit SimpleTokenizer(const std::string &line); + explicit HRWSimpleTokenizer(const std::string &line); // noncopyable - SimpleTokenizer(const SimpleTokenizer &) = delete; - void operator=(const SimpleTokenizer &) = delete; + HRWSimpleTokenizer(const HRWSimpleTokenizer &) = delete; + void operator=(const HRWSimpleTokenizer &) = delete; const std::vector & get_tokens() const diff --git a/plugins/header_rewrite/value.cc b/plugins/header_rewrite/value.cc index fc4dcc0e09b..e6c8ddc0dea 100644 --- a/plugins/header_rewrite/value.cc +++ b/plugins/header_rewrite/value.cc @@ -44,7 +44,7 @@ Value::set_value(const std::string &val) _value = val; if (_value.find("%{") != std::string::npos) { - SimpleTokenizer tokenizer(_value); + HRWSimpleTokenizer tokenizer(_value); auto tokens = tokenizer.get_tokens(); for (auto token : tokens) {