Fixed merge for some reason.
This commit is contained in:
commit
6ded352265
@ -4,8 +4,7 @@
|
||||
#include "Log.h"
|
||||
#include "TCPSession.h"
|
||||
|
||||
namespace core
|
||||
{
|
||||
namespace core {
|
||||
|
||||
TCPServer::TCPServer(EPoll &ePoll, IPAddress address, std::string delimiter, int depth, std::string text)
|
||||
: TCPSocket(ePoll, text), commands(delimiter, depth) {
|
||||
|
@ -24,8 +24,7 @@ namespace core
|
||||
/// process commands to display status information.
|
||||
///
|
||||
|
||||
class TCPServer : public TCPSocket, public Command
|
||||
{
|
||||
class TCPServer : public TCPSocket, public Command {
|
||||
|
||||
public:
|
||||
///
|
||||
|
Loading…
x
Reference in New Issue
Block a user