diff options
Diffstat (limited to 'lib/server/SocketStream.h')
| -rw-r--r-- | lib/server/SocketStream.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/server/SocketStream.h b/lib/server/SocketStream.h index aa62e4e9..2fb5e391 100644 --- a/lib/server/SocketStream.h +++ b/lib/server/SocketStream.h @@ -51,10 +51,6 @@ public: virtual bool GetPeerCredentials(uid_t &rUidOut, gid_t &rGidOut); protected: -<<<<<<< HEAD - tOSSocketHandle GetSocketHandle(); -======= ->>>>>>> 0.12 void MarkAsReadClosed() {mReadClosed = true;} void MarkAsWriteClosed() {mWriteClosed = true;} @@ -72,14 +68,11 @@ public: off_t GetBytesWritten() const {return mBytesWritten;} void ResetCounters() {mBytesRead = mBytesWritten = 0;} bool IsOpened() { return mSocketHandle != INVALID_SOCKET_VALUE; } -<<<<<<< HEAD -======= /** * Only for use by NiceSocketStream! */ tOSSocketHandle GetSocketHandle(); ->>>>>>> 0.12 }; #endif // SOCKETSTREAM__H |