resolved merge conflicts, now ConfigParser is even more intertwined with other parts

This commit is contained in:
Me
2022-07-31 16:30:14 +02:00
12 changed files with 118 additions and 127 deletions

View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/07/13 22:11:17 by me #+# #+# */
/* Updated: 2022/07/30 23:07:42 by lperrey ### ########.fr */
/* Updated: 2022/07/31 13:18:14 by simplonco ### ########.fr */
/* */
/* ************************************************************************** */
@@ -216,7 +216,7 @@ void ConfigParser::_set_server_values(ServerConfig *server, \
value = _pre_set_val_check(key, value);
std::vector<std::string> tmp_val = split(value, ' ');
std::vector<std::string> tmp_val = ::split(value, ' ');
size_t size = tmp_val.size();
if (size < 1)
@@ -239,7 +239,7 @@ void ConfigParser::_set_server_values(ServerConfig *server, \
}
else
{
std::vector<std::string> tmp2 = split(tmp_val[0], ':');
std::vector<std::string> tmp2 = ::split(tmp_val[0], ':');
if (!(isNumeric(tmp2[1])))
throw std::invalid_argument("value not a number");