From ddaa001dafb5122e6e363e4acbbe6ce045b7b104 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 21 Jan 2013 22:31:16 -0500 Subject: Merge usefulness of Flags and Extensible classes into Extensible, made most flags we have juse strings instead of defines/enums --- src/socket_clients.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/socket_clients.cpp') diff --git a/src/socket_clients.cpp b/src/socket_clients.cpp index 32f9c1ff6..3686b2c0a 100644 --- a/src/socket_clients.cpp +++ b/src/socket_clients.cpp @@ -30,12 +30,12 @@ bool ConnectionSocket::Process() { try { - if (this->HasFlag(SF_CONNECTED)) + if (this->flags[SF_CONNECTED]) return true; - else if (this->HasFlag(SF_CONNECTING)) - this->SetFlag(this->io->FinishConnect(this)); + else if (this->flags[SF_CONNECTING]) + this->flags[this->io->FinishConnect(this)] = true; else - this->SetFlag(SF_DEAD); + this->flags[SF_DEAD] = true; } catch (const SocketException &ex) { @@ -70,12 +70,12 @@ bool ClientSocket::Process() { try { - if (this->HasFlag(SF_ACCEPTED)) + if (this->flags[SF_ACCEPTED]) return true; - else if (this->HasFlag(SF_ACCEPTING)) - this->SetFlag(this->io->FinishAccept(this)); + else if (this->flags[SF_ACCEPTING]) + this->flags[this->io->FinishAccept(this)] = true; else - this->SetFlag(SF_DEAD); + this->flags[SF_DEAD] = true; } catch (const SocketException &ex) { -- cgit