From e5ad79591763893d12b24e83c21bd77fcc21efa5 Mon Sep 17 00:00:00 2001 From: whaffman Date: Fri, 26 Sep 2025 18:08:52 +0200 Subject: [PATCH] fix: apply IWYU suggestions and format --- webserv/client/Client.cpp | 20 ++++++----- webserv/client/Client.hpp | 9 ++--- webserv/config/AConfig.cpp | 13 +++---- webserv/config/AConfig.hpp | 11 +++--- webserv/config/ConfigManager.cpp | 17 ++++----- webserv/config/ConfigManager.hpp | 9 ++--- webserv/config/GlobalConfig.cpp | 12 ++++--- webserv/config/GlobalConfig.hpp | 11 +++--- webserv/config/LocationConfig.hpp | 5 +-- webserv/config/ServerConfig.cpp | 18 +++++----- webserv/config/ServerConfig.hpp | 13 +++---- webserv/config/directive/ADirective.hpp | 1 + webserv/config/directive/BoolDirective.cpp | 15 ++++---- webserv/config/directive/BoolDirective.hpp | 1 + webserv/config/directive/DirectiveFactory.cpp | 25 ++++++------- webserv/config/directive/DirectiveFactory.hpp | 1 + webserv/config/directive/DirectiveValue.cpp | 11 +++--- webserv/config/directive/IntDirective.cpp | 6 ++-- webserv/config/directive/IntDirective.hpp | 1 + .../config/directive/IntStringDirective.cpp | 11 +++--- .../config/directive/IntStringDirective.hpp | 1 + webserv/config/directive/SizeDirective.cpp | 15 ++++---- webserv/config/directive/SizeDirective.hpp | 1 + webserv/config/directive/StringDirective.cpp | 6 ++-- webserv/config/directive/StringDirective.hpp | 1 + webserv/config/directive/VectorDirective.cpp | 9 ++--- webserv/config/directive/VectorDirective.hpp | 1 + webserv/config/utils.cpp | 1 + webserv/http/HttpHeaders.cpp | 1 + webserv/http/HttpRequest.cpp | 5 +-- webserv/http/HttpRequest.hpp | 9 ++--- webserv/log/Channel.cpp | 1 + webserv/log/Channel.hpp | 1 + webserv/log/FileChannel.cpp | 1 + webserv/log/FileChannel.hpp | 1 + webserv/log/Log.cpp | 1 + webserv/log/StdoutChannel.cpp | 1 + webserv/log/StdoutChannel.hpp | 1 + webserv/main.cpp | 1 + webserv/server/Server.cpp | 36 ++++++++++--------- webserv/server/Server.hpp | 13 +++---- webserv/socket/Socket.cpp | 6 ++-- webserv/socket/Socket.hpp | 3 +- 43 files changed, 186 insertions(+), 140 deletions(-) diff --git a/webserv/client/Client.cpp b/webserv/client/Client.cpp index a598f86..4da4193 100644 --- a/webserv/client/Client.cpp +++ b/webserv/client/Client.cpp @@ -1,13 +1,15 @@ #include -#include // for HttpHeaders -#include // for Log, LOCATION -#include // for Server -#include // for Socket -#include // for ssize_t -#include // for uint8_t -#include // for reference_wrapper, cref, ref -#include // for map -#include // for pair, move +#include // for HttpHeaders +#include // for Log, LOCATION +#include // for Server +#include // for Socket + +#include // for uint8_t +#include // for reference_wrapper, cref, ref +#include // for map +#include // for pair, move + +#include // for ssize_t class ServerConfig; diff --git a/webserv/client/Client.hpp b/webserv/client/Client.hpp index 32723c6..da88db7 100644 --- a/webserv/client/Client.hpp +++ b/webserv/client/Client.hpp @@ -1,12 +1,13 @@ #pragma once #include // for ServerConfig -#include // for HttpRequest +#include // for HttpRequest #include #include -#include // for size_t -#include // for unique_ptr -#include // for string + +#include // for size_t +#include // for unique_ptr +#include // for string class Server; class Socket; diff --git a/webserv/config/AConfig.cpp b/webserv/config/AConfig.cpp index 6235328..07b1b3f 100644 --- a/webserv/config/AConfig.cpp +++ b/webserv/config/AConfig.cpp @@ -1,10 +1,11 @@ #include // for AConfig -#include // for ADirective -#include // for DirectiveFactory -#include // for trim -#include // for Log, LOCATION -#include // for basic_stringstream, stringstream -#include // for move, pair +#include // for ADirective +#include // for DirectiveFactory +#include // for trim +#include // for Log, LOCATION + +#include // for basic_stringstream, stringstream +#include // for move, pair AConfig::AConfig(const AConfig *parent) : parent_(parent) {} diff --git a/webserv/config/AConfig.hpp b/webserv/config/AConfig.hpp index f6df4ec..b47b231 100644 --- a/webserv/config/AConfig.hpp +++ b/webserv/config/AConfig.hpp @@ -1,12 +1,13 @@ #pragma once -#include // for ADirective -#include // for map -#include // for unique_ptr -#include // for basic_string, string - #include "webserv/config/directive/DirectiveValue.hpp" +#include // for ADirective + +#include // for map +#include // for unique_ptr +#include // for basic_string, string + class AConfig { public: diff --git a/webserv/config/ConfigManager.cpp b/webserv/config/ConfigManager.cpp index 055eb17..2651c6b 100644 --- a/webserv/config/ConfigManager.cpp +++ b/webserv/config/ConfigManager.cpp @@ -1,12 +1,13 @@ -#include -#include // for removeComments -#include // for Log -#include // for basic_ifstream, basic_filebuf, basic_ostream::operator<<, ifstream, stringstream -#include // for basic_stringstream -#include // for runtime_error -#include // for char_traits, operator+, basic_string, string +#include "webserv/config/GlobalConfig.hpp" // for GlobalConfig -#include "webserv/config/GlobalConfig.hpp" // for GlobalConfig +#include +#include // for removeComments +#include // for Log + +#include // for basic_ifstream, basic_filebuf, basic_ostream::operator<<, ifstream, stringstream +#include // for basic_stringstream +#include // for runtime_error +#include // for char_traits, operator+, basic_string, string ConfigManager::ConfigManager() : initialized_(false) {} diff --git a/webserv/config/ConfigManager.hpp b/webserv/config/ConfigManager.hpp index 3c0935a..6ab1f7c 100644 --- a/webserv/config/ConfigManager.hpp +++ b/webserv/config/ConfigManager.hpp @@ -1,10 +1,11 @@ #pragma once #include -#include // for ServerConfig -#include // for unique_ptr -#include // for string -#include // for vector +#include // for ServerConfig + +#include // for unique_ptr +#include // for string +#include // for vector class ADirective; class GlobalConfig; diff --git a/webserv/config/GlobalConfig.cpp b/webserv/config/GlobalConfig.cpp index 3d2066a..660d9e4 100644 --- a/webserv/config/GlobalConfig.cpp +++ b/webserv/config/GlobalConfig.cpp @@ -1,9 +1,11 @@ #include -#include // for findCorrespondingClosingBrace -#include // for Log -#include // for size_t -#include // for vector -#include // for runtime_error +#include // for findCorrespondingClosingBrace +#include // for Log + +#include // for runtime_error +#include // for vector + +#include // for size_t GlobalConfig::GlobalConfig(const std::string &block) { diff --git a/webserv/config/GlobalConfig.hpp b/webserv/config/GlobalConfig.hpp index 464916b..6ce3411 100644 --- a/webserv/config/GlobalConfig.hpp +++ b/webserv/config/GlobalConfig.hpp @@ -1,10 +1,11 @@ #pragma once -#include // for AConfig -#include // for ServerConfig -#include // for unique_ptr -#include // for string -#include // for vector +#include // for AConfig +#include // for ServerConfig + +#include // for unique_ptr +#include // for string +#include // for vector class GlobalConfig : public AConfig { diff --git a/webserv/config/LocationConfig.hpp b/webserv/config/LocationConfig.hpp index d4d28ca..66b9513 100644 --- a/webserv/config/LocationConfig.hpp +++ b/webserv/config/LocationConfig.hpp @@ -1,7 +1,8 @@ #pragma once -#include // for AConfig -#include // for string +#include // for AConfig + +#include // for string class LocationConfig : public AConfig { diff --git a/webserv/config/ServerConfig.cpp b/webserv/config/ServerConfig.cpp index 5d5da7a..1c56e8f 100644 --- a/webserv/config/ServerConfig.cpp +++ b/webserv/config/ServerConfig.cpp @@ -1,12 +1,14 @@ -#include // for LocationConfig -#include -#include // for findCorrespondingClosingBrace, trim -#include // for Log, LOCATION -#include // for size_t -#include // for runtime_error -#include // for pair +#include "webserv/config/AConfig.hpp" // for AConfig -#include "webserv/config/AConfig.hpp" // for AConfig +#include // for LocationConfig +#include +#include // for findCorrespondingClosingBrace, trim +#include // for Log, LOCATION + +#include // for runtime_error +#include // for pair + +#include // for size_t ServerConfig::ServerConfig(const std::string &block, const AConfig *parent) : AConfig(parent) { diff --git a/webserv/config/ServerConfig.hpp b/webserv/config/ServerConfig.hpp index 490f03f..10d6db0 100644 --- a/webserv/config/ServerConfig.hpp +++ b/webserv/config/ServerConfig.hpp @@ -1,11 +1,12 @@ #pragma once -#include // for AConfig -#include // for LocationConfig -#include // for map -#include // for unique_ptr -#include // for basic_string, string -#include // for vector +#include // for AConfig +#include // for LocationConfig + +#include // for map +#include // for unique_ptr +#include // for basic_string, string +#include // for vector class ServerConfig : public AConfig { diff --git a/webserv/config/directive/ADirective.hpp b/webserv/config/directive/ADirective.hpp index 89917bf..a6ee2e5 100644 --- a/webserv/config/directive/ADirective.hpp +++ b/webserv/config/directive/ADirective.hpp @@ -1,6 +1,7 @@ #pragma once #include // for DirectiveValue, DirectiveValueType + #include // for ostream #include // for string, basic_string #include // for move diff --git a/webserv/config/directive/BoolDirective.cpp b/webserv/config/directive/BoolDirective.cpp index d03a47d..ab8ebc3 100644 --- a/webserv/config/directive/BoolDirective.cpp +++ b/webserv/config/directive/BoolDirective.cpp @@ -1,11 +1,12 @@ -#include // for IntDirective -#include // for trim -#include // for __transform_fn, transform -#include // for tolower -#include // for invalid_argument +#include "webserv/config/directive/ADirective.hpp" // for ADirective +#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType -#include "webserv/config/directive/ADirective.hpp" // for ADirective -#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType +#include // for IntDirective +#include // for trim + +#include // for __transform_fn, transform +#include // for tolower +#include // for invalid_argument BoolDirective::BoolDirective(const std::string &name, const std::string &value) : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters) diff --git a/webserv/config/directive/BoolDirective.hpp b/webserv/config/directive/BoolDirective.hpp index 508d969..ff3bbc8 100644 --- a/webserv/config/directive/BoolDirective.hpp +++ b/webserv/config/directive/BoolDirective.hpp @@ -2,6 +2,7 @@ #include // for ADirective #include // for DirectiveValueType + #include // for string, basic_string class BoolDirective : public ADirective diff --git a/webserv/config/directive/DirectiveFactory.cpp b/webserv/config/directive/DirectiveFactory.cpp index 7ecc26c..a44213c 100644 --- a/webserv/config/directive/DirectiveFactory.cpp +++ b/webserv/config/directive/DirectiveFactory.cpp @@ -1,16 +1,17 @@ -#include // for BoolDirective -#include // for DirectiveFactory -#include // for IntDirective -#include // for IntStringDirective -#include // for SizeDirective -#include // for StringDirective -#include // for VectorDirective -#include // for trim, trimSemi -#include // for basic_stringstream, stringstream -#include // for invalid_argument -#include // for pair +#include "webserv/log/Log.hpp" // for LOCATION, Log -#include "webserv/log/Log.hpp" // for LOCATION, Log +#include // for BoolDirective +#include // for DirectiveFactory +#include // for IntDirective +#include // for IntStringDirective +#include // for SizeDirective +#include // for StringDirective +#include // for VectorDirective +#include // for trim, trimSemi + +#include // for basic_stringstream, stringstream +#include // for invalid_argument +#include // for pair class ADirective; diff --git a/webserv/config/directive/DirectiveFactory.hpp b/webserv/config/directive/DirectiveFactory.hpp index 8e6a558..b8df032 100644 --- a/webserv/config/directive/DirectiveFactory.hpp +++ b/webserv/config/directive/DirectiveFactory.hpp @@ -1,5 +1,6 @@ #pragma once #include // for ADirective + #include // for array #include // for function #include // for unique_ptr diff --git a/webserv/config/directive/DirectiveValue.cpp b/webserv/config/directive/DirectiveValue.cpp index 4ad7ce4..aced0c8 100644 --- a/webserv/config/directive/DirectiveValue.cpp +++ b/webserv/config/directive/DirectiveValue.cpp @@ -1,9 +1,10 @@ #include -#include // for size_t -#include // for string, basic_string, allocator, operator+, char_traits, to_string, operator<< -#include // for pair -#include // for visit -#include // for vector + +#include // for size_t +#include // for string, basic_string, allocator, operator+, char_traits, to_string, operator<< +#include // for pair +#include // for visit +#include // for vector // diff --git a/webserv/config/directive/IntDirective.cpp b/webserv/config/directive/IntDirective.cpp index 5cb4fd4..d4e9452 100644 --- a/webserv/config/directive/IntDirective.cpp +++ b/webserv/config/directive/IntDirective.cpp @@ -1,7 +1,7 @@ -#include // for IntDirective +#include "webserv/config/directive/ADirective.hpp" // for ADirective +#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType -#include "webserv/config/directive/ADirective.hpp" // for ADirective -#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType +#include // for IntDirective IntDirective::IntDirective(const std::string &name, const std::string &value) : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters) diff --git a/webserv/config/directive/IntDirective.hpp b/webserv/config/directive/IntDirective.hpp index 972db46..1f83da8 100644 --- a/webserv/config/directive/IntDirective.hpp +++ b/webserv/config/directive/IntDirective.hpp @@ -2,6 +2,7 @@ #include // for ADirective #include // for DirectiveValueType + #include // for string, basic_string class IntDirective : public ADirective diff --git a/webserv/config/directive/IntStringDirective.cpp b/webserv/config/directive/IntStringDirective.cpp index d002df7..969f497 100644 --- a/webserv/config/directive/IntStringDirective.cpp +++ b/webserv/config/directive/IntStringDirective.cpp @@ -1,9 +1,10 @@ -#include // for IntDirective -#include // for trim -#include // for basic_istringstream, basic_istream::operator>>, istringstream +#include "webserv/config/directive/ADirective.hpp" // for ADirective +#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType -#include "webserv/config/directive/ADirective.hpp" // for ADirective -#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType +#include // for IntDirective +#include // for trim + +#include // for basic_istringstream, basic_istream::operator>>, istringstream IntStringDirective::IntStringDirective(const std::string &name, const std::string &value) : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters) diff --git a/webserv/config/directive/IntStringDirective.hpp b/webserv/config/directive/IntStringDirective.hpp index c085631..a0f5280 100644 --- a/webserv/config/directive/IntStringDirective.hpp +++ b/webserv/config/directive/IntStringDirective.hpp @@ -1,6 +1,7 @@ #pragma once #include // for ADirective #include // for DirectiveValueType + #include // for basic_string, string #include // for pair diff --git a/webserv/config/directive/SizeDirective.cpp b/webserv/config/directive/SizeDirective.cpp index f590070..729cc4d 100644 --- a/webserv/config/directive/SizeDirective.cpp +++ b/webserv/config/directive/SizeDirective.cpp @@ -1,11 +1,12 @@ -#include // for SizeDirective -#include // for trim -#include // for __transform_fn, transform -#include // for tolower -#include // for invalid_argument +#include "webserv/config/directive/ADirective.hpp" // for ADirective +#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType -#include "webserv/config/directive/ADirective.hpp" // for ADirective -#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType +#include // for SizeDirective +#include // for trim + +#include // for __transform_fn, transform +#include // for tolower +#include // for invalid_argument SizeDirective::SizeDirective(const std::string &name, const std::string &value) : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters) diff --git a/webserv/config/directive/SizeDirective.hpp b/webserv/config/directive/SizeDirective.hpp index 329c653..5cd0baf 100644 --- a/webserv/config/directive/SizeDirective.hpp +++ b/webserv/config/directive/SizeDirective.hpp @@ -2,6 +2,7 @@ #include // for ADirective #include // for DirectiveValueType + #include // for size_t #include // for string, basic_string diff --git a/webserv/config/directive/StringDirective.cpp b/webserv/config/directive/StringDirective.cpp index e0049c1..1b5c481 100644 --- a/webserv/config/directive/StringDirective.cpp +++ b/webserv/config/directive/StringDirective.cpp @@ -1,7 +1,7 @@ -#include // for IntDirective +#include "webserv/config/directive/ADirective.hpp" // for ADirective +#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType -#include "webserv/config/directive/ADirective.hpp" // for ADirective -#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType +#include // for IntDirective StringDirective::StringDirective(const std::string &name, const std::string &value) : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters) diff --git a/webserv/config/directive/StringDirective.hpp b/webserv/config/directive/StringDirective.hpp index 517a6ab..f0befbd 100644 --- a/webserv/config/directive/StringDirective.hpp +++ b/webserv/config/directive/StringDirective.hpp @@ -2,6 +2,7 @@ #include // for ADirective #include // for DirectiveValueType + #include // for string, basic_string class StringDirective : public ADirective diff --git a/webserv/config/directive/VectorDirective.cpp b/webserv/config/directive/VectorDirective.cpp index 0efe756..1868b42 100644 --- a/webserv/config/directive/VectorDirective.cpp +++ b/webserv/config/directive/VectorDirective.cpp @@ -1,8 +1,9 @@ -#include // for IntDirective -#include // for basic_stringstream, stringstream +#include "webserv/config/directive/ADirective.hpp" // for ADirective +#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType -#include "webserv/config/directive/ADirective.hpp" // for ADirective -#include "webserv/config/directive/DirectiveValue.hpp" // for DirectiveValueType +#include // for IntDirective + +#include // for basic_stringstream, stringstream VectorDirective::VectorDirective(const std::string &name, const std::string &value) : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters) diff --git a/webserv/config/directive/VectorDirective.hpp b/webserv/config/directive/VectorDirective.hpp index 5cb5829..379cf6a 100644 --- a/webserv/config/directive/VectorDirective.hpp +++ b/webserv/config/directive/VectorDirective.hpp @@ -2,6 +2,7 @@ #include // for ADirective #include // for DirectiveValueType + #include // for basic_string, string #include // for vector diff --git a/webserv/config/utils.cpp b/webserv/config/utils.cpp index 1dd3132..94f927e 100644 --- a/webserv/config/utils.cpp +++ b/webserv/config/utils.cpp @@ -1,5 +1,6 @@ #include + #include #include #include diff --git a/webserv/http/HttpHeaders.cpp b/webserv/http/HttpHeaders.cpp index 3073e42..6a75d38 100644 --- a/webserv/http/HttpHeaders.cpp +++ b/webserv/http/HttpHeaders.cpp @@ -2,6 +2,7 @@ #include // for CRLF #include // for HttpHeaders #include + #include // for __transform_fn, transform #include // for tolower #include // for pair diff --git a/webserv/http/HttpRequest.cpp b/webserv/http/HttpRequest.cpp index 4a3285c..bd98191 100644 --- a/webserv/http/HttpRequest.cpp +++ b/webserv/http/HttpRequest.cpp @@ -1,14 +1,15 @@ +#include "webserv/config/utils.hpp" // for stoul + #include // for CRLF, DOUBLE_CRLF #include #include // for Log, LOCATION + #include // for map #include // for optional #include // for basic_stringstream, basic_istream, stringstream #include // for pair #include // for vector -#include "webserv/config/utils.hpp" // for stoul - class ServerConfig; HttpRequest::HttpRequest(const ServerConfig *serverConfig, const Client *client) diff --git a/webserv/http/HttpRequest.hpp b/webserv/http/HttpRequest.hpp index 966f482..c4d04af 100644 --- a/webserv/http/HttpRequest.hpp +++ b/webserv/http/HttpRequest.hpp @@ -1,10 +1,11 @@ #pragma once #include -#include // for HttpHeaders -#include // for size_t -#include // for uint8_t -#include // for string, basic_string +#include // for HttpHeaders + +#include // for size_t +#include // for uint8_t +#include // for string, basic_string class Client; class ServerConfig; diff --git a/webserv/log/Channel.cpp b/webserv/log/Channel.cpp index 043f3ab..9c89028 100644 --- a/webserv/log/Channel.cpp +++ b/webserv/log/Channel.cpp @@ -1,4 +1,5 @@ #include + #include // for operator<<, setfill, setw #include // for basic_ostream, operator<<, basic_stringstream, basic_istream, basic_istringstream, right, istringstream, stringstream #include // for get diff --git a/webserv/log/Channel.hpp b/webserv/log/Channel.hpp index 91e7e0c..490de56 100644 --- a/webserv/log/Channel.hpp +++ b/webserv/log/Channel.hpp @@ -1,6 +1,7 @@ #pragma once #include + #include #include diff --git a/webserv/log/FileChannel.cpp b/webserv/log/FileChannel.cpp index e531770..40b85b9 100644 --- a/webserv/log/FileChannel.cpp +++ b/webserv/log/FileChannel.cpp @@ -1,5 +1,6 @@ #include #include // for Log + #include // for system_clock #include // for localtime, tm #include // for operator<<, put_time diff --git a/webserv/log/FileChannel.hpp b/webserv/log/FileChannel.hpp index 09bb50e..9490817 100644 --- a/webserv/log/FileChannel.hpp +++ b/webserv/log/FileChannel.hpp @@ -2,6 +2,7 @@ #include // for Channel #include // for Log + #include // for basic_ofstream, ios_base, ofstream #include // for map #include // for string, basic_string diff --git a/webserv/log/Log.cpp b/webserv/log/Log.cpp index 0b6df4e..8a66ef3 100644 --- a/webserv/log/Log.cpp +++ b/webserv/log/Log.cpp @@ -2,6 +2,7 @@ #include // for FileChannel #include #include // for StdoutChannel + #include // for duration_cast, operator-, steady_clock, duration, seconds #include // for exception #include // for basic_ostream, operator<<, cerr diff --git a/webserv/log/StdoutChannel.cpp b/webserv/log/StdoutChannel.cpp index 7d22650..a2cad0b 100644 --- a/webserv/log/StdoutChannel.cpp +++ b/webserv/log/StdoutChannel.cpp @@ -1,5 +1,6 @@ #include // for Log #include + #include // for operator<<, setfill, setw #include // for basic_ostream, operator<<, basic_ostream::operator<<, cerr, cout, flush, ostream diff --git a/webserv/log/StdoutChannel.hpp b/webserv/log/StdoutChannel.hpp index cdd30dc..e88dcd7 100644 --- a/webserv/log/StdoutChannel.hpp +++ b/webserv/log/StdoutChannel.hpp @@ -2,6 +2,7 @@ #include // for Channel #include // for Log + #include // for map #include // for string, basic_string diff --git a/webserv/main.cpp b/webserv/main.cpp index eab5a18..1f28768 100644 --- a/webserv/main.cpp +++ b/webserv/main.cpp @@ -1,6 +1,7 @@ #include // for ConfigManager #include // for Log, LOCATION #include // for Server + #include // for basic_ostream, operator<<, cerr, ios_base #include // for map #include // for basic_string, char_traits, allocator, operator+, operator<=> diff --git a/webserv/server/Server.cpp b/webserv/server/Server.cpp index dc8956c..02b45ff 100644 --- a/webserv/server/Server.cpp +++ b/webserv/server/Server.cpp @@ -1,21 +1,23 @@ -#include // for Client -#include // for ConfigManager -#include // for Log +#include // for Client +#include // for ConfigManager +#include // for ServerConfig +#include // for Log #include -#include // for Socket -#include // for epoll_event, epoll_ctl, EPOLLIN, EPOLLOUT, epoll_create1, epoll_wait, EPOLLERR, EPOLLHUP, EPOLL_CTL_ADD, EPOLL_CTL_DEL, EPOLL_CTL_MOD -#include // for send, SOMAXCONN -#include // for ssize_t -#include // for close -#include // for ServerConfig -#include // for errno -#include // for strerror, strlen -#include // for exception -#include // for unique_ptr, allocator, make_unique -#include // for runtime_error -#include // for basic_string, operator+, to_string, char_traits, string -#include // for move, pair -#include // for vector +#include // for Socket + +#include // for errno +#include // for strerror, strlen +#include // for exception +#include // for unique_ptr, allocator, make_unique +#include // for runtime_error +#include // for basic_string, operator+, to_string, char_traits, string +#include // for move, pair +#include // for vector + +#include // for epoll_event, epoll_ctl, EPOLLIN, EPOLLOUT, epoll_create1, epoll_wait, EPOLLERR, EPOLLHUP, EPOLL_CTL_ADD, EPOLL_CTL_DEL, EPOLL_CTL_MOD +#include // for send, SOMAXCONN +#include // for ssize_t +#include // for close Server::Server(const ConfigManager &configManager) : epoll_fd_(epoll_create1(0)), configManager_(configManager) { diff --git a/webserv/server/Server.hpp b/webserv/server/Server.hpp index e92a5b0..3ae645a 100644 --- a/webserv/server/Server.hpp +++ b/webserv/server/Server.hpp @@ -3,12 +3,13 @@ #include #include #include // for ServerConfig -#include // for Socket -#include // for uint32_t -#include // for reference_wrapper -#include // for unique_ptr -#include // for unordered_map -#include // for vector +#include // for Socket + +#include // for uint32_t +#include // for reference_wrapper +#include // for unique_ptr +#include // for unordered_map +#include // for vector class Client; class ConfigManager; diff --git a/webserv/socket/Socket.cpp b/webserv/socket/Socket.cpp index a9b27d0..60a584a 100644 --- a/webserv/socket/Socket.cpp +++ b/webserv/socket/Socket.cpp @@ -1,12 +1,14 @@ #include #include + +#include +#include + #include // For inet_addr #include // For fcntl()" #include // For sockaddr_in #include #include // For close() -#include -#include Socket::Socket() : fd_(socket(AF_INET, SOCK_STREAM, 0)) { diff --git a/webserv/socket/Socket.hpp b/webserv/socket/Socket.hpp index 5d99cd7..11b0eba 100644 --- a/webserv/socket/Socket.hpp +++ b/webserv/socket/Socket.hpp @@ -1,10 +1,11 @@ #pragma once -#include // for ssize_t #include // for size_t #include // for unique_ptr #include // for string +#include // for ssize_t + class Socket { public: