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

@@ -47,9 +47,6 @@
#include "src/utils/string.h"
using modsecurity::utils::String;
namespace modsecurity {
namespace Variables {
@@ -57,7 +54,7 @@ void Rule::evaluateInternal(Transaction *t,
modsecurity::Rule *rule,
std::vector<const collection::Variable *> *l) {
std::map<std::string, std::string> envs;
std::string m_name_upper = String::toupper(m_name);
std::string m_name_upper = utils::string::toupper(m_name);
// id
envs.insert(std::pair<std::string, std::string>("RULE:id",
@@ -99,7 +96,7 @@ void Rule::evaluateInternal(Transaction *t,
}
for (auto& x : envs) {
std::string xup = String::toupper(x.first);
std::string xup = utils::string::toupper(x.first);
if ((xup.substr(0, m_name_upper.size() + 1)
.compare(m_name_upper + ":") != 0)
&& (xup != m_name_upper)) {