Moves static methods from class String to the namespace string

This commit is contained in:
Felipe Zimmerle
2016-11-04 15:58:05 -03:00
parent 62a0cb468b
commit 2244e874e2
31 changed files with 151 additions and 182 deletions

View File

@@ -122,7 +122,6 @@ using modsecurity::actions::Ver;
using modsecurity::actions::transformations::None;
using modsecurity::actions::transformations::Transformation;
using modsecurity::operators::Operator;
using modsecurity::utils::String;
@@ -578,7 +577,7 @@ expression:
}
| CONFIG_DIR_SEC_MARKER
{
driver.addSecMarker(String::removeBracketsIfNeeded($1));
driver.addSecMarker(modsecurity::utils::string::removeBracketsIfNeeded($1));
}
| CONFIG_DIR_RULE_ENG CONFIG_VALUE_OFF
{

View File

@@ -11,7 +11,6 @@
using modsecurity::Parser::Driver;
using modsecurity::Utils::HttpsClient;
using modsecurity::utils::String;
typedef yy::seclang_parser p;
@@ -436,7 +435,7 @@ VAR_FREE_TEXT_SPACE_COMMA [^, \t\"]+
std::string key;
std::string url;
std::vector<std::string> conf = String::split(yytext, ' ');
std::vector<std::string> conf = modsecurity::utils::string::split(yytext, ' ');
key = conf[1];
url = conf[2];
c.setKey(key);