merge in changes by denis bider and fix compile on gcc 3.4.4 and MSVC 6

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@219 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 8 insertions, 3 deletions

diff --git a/socketft.h b/socketft.h
index c7d33fd..d23dd40 100644
--- a/socketft.h
+++ b/socketft.h
@@ -77,6 +77,7 @@ public:
 	bool Connect(const sockaddr* psa, socklen_t saLen);
 	bool Accept(Socket& s, sockaddr *psa=NULL, socklen_t *psaLen=NULL);
 	void GetSockName(sockaddr *psa, socklen_t *psaLen);
+	void GetPeerName(sockaddr *psa, socklen_t *psaLen);
 	unsigned int Send(const byte* buf, size_t bufLen, int flags=0);
 	unsigned int Receive(byte* buf, size_t bufLen, int flags=0);
 	void ShutDown(int how = SD_SEND);
@@ -128,6 +129,7 @@ public:
 #ifdef USE_BERKELEY_STYLE_SOCKETS
 	bool MustWaitToReceive() {return true;}
 #else
+	~SocketReceiver();
 	bool MustWaitForResult() {return true;}
 #endif
 	bool Receive(byte* buf, size_t bufLen);
@@ -135,7 +137,7 @@ public:
 	bool EofReceived() const {return m_eofReceived;}
 
 	unsigned int GetMaxWaitObjectCount() const {return 1;}
-	void GetWaitObjects(WaitObjectContainer &container);
+	void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack);
 
 private:
 	Socket &m_s;
@@ -159,14 +161,17 @@ public:
 #ifdef USE_BERKELEY_STYLE_SOCKETS
 	bool MustWaitToSend() {return true;}
 #else
+	~SocketSender();
 	bool MustWaitForResult() {return true;}
+	bool MustWaitForEof() { return true; }
+	bool EofSent();
 #endif
 	void Send(const byte* buf, size_t bufLen);
 	unsigned int GetSendResult();
-	void SendEof() {m_s.ShutDown(SD_SEND);}
+	void SendEof();
 
 	unsigned int GetMaxWaitObjectCount() const {return 1;}
-	void GetWaitObjects(WaitObjectContainer &container);
+	void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack);
 
 private:
 	Socket &m_s;