Fixed merge for some reason.

This commit is contained in:
Brad Arant committed 2024-07-10 13:39:55 -07:00
commit 6ded352265
2 files changed
+3 -5

No files matched your search

+2 -3
View File
@@ -4,8 +4,7 @@
#include "Log.h" #include "Log.h"
#include "TCPSession.h" #include "TCPSession.h"
namespace core namespace core {
{
TCPServer::TCPServer(EPoll &ePoll, IPAddress address, std::string delimiter, int depth, std::string text) TCPServer::TCPServer(EPoll &ePoll, IPAddress address, std::string delimiter, int depth, std::string text)
: TCPSocket(ePoll, text), commands(delimiter, depth) { : TCPSocket(ePoll, text), commands(delimiter, depth) {
@@ -105,7 +104,7 @@ namespace core
void TCPServer::sendToAll(std::stringstream &data) { void TCPServer::sendToAll(std::stringstream &data) {
for (auto session : sessions) for (auto session : sessions)
session->write(data.str()); session->write(data.str());
data.str(""); data.str("");
} }
+1 -2
View File
@@ -24,8 +24,7 @@ namespace core
/// process commands to display status information. /// process commands to display status information.
/// ///
class TCPServer : public TCPSocket, public Command class TCPServer : public TCPSocket, public Command {
{
public: public:
/// ///