From 0f45267a6a1fc9f5c239b994698edf26fd94bfec Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 28 Aug 2007 19:03:18 +0000 Subject: [PATCH] compile on gcc --- direct/src/http/baseincomingset.h | 2 ++ direct/src/http/baseincomingset.i | 8 ++++---- direct/src/http/http_request.cxx | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/direct/src/http/baseincomingset.h b/direct/src/http/baseincomingset.h index 363fb94774..4455587a07 100644 --- a/direct/src/http/baseincomingset.h +++ b/direct/src/http/baseincomingset.h @@ -27,6 +27,8 @@ enum CloseState //////////////////////////////////////////////////////////////////// template < class _INCLASS1,class _IN_LISTEN, class MESSAGE_READER_BUF, class MESSAGE_READER_UPPASS> class BaseIncomingSet : public std::list<_INCLASS1 *> { + typedef std::list<_INCLASS1 *> BaseClass; + typedef TYPENAME BaseClass::iterator iterator; _IN_LISTEN _Listener; inline void AddFromListener(void); diff --git a/direct/src/http/baseincomingset.i b/direct/src/http/baseincomingset.i index 6eb75b6589..fed1126644 100644 --- a/direct/src/http/baseincomingset.i +++ b/direct/src/http/baseincomingset.i @@ -38,7 +38,7 @@ inline int BaseIncomingSet<_INCLASS1,_IN_LISTEN,MESSAGE_READER_BUF,MESSAGE_READE MESSAGE_READER_BUF message; iterator lpNext, lp; - for (lpNext = lp = begin(); lp != end() ; lp = lpNext) + for (lpNext = lp = BaseClass::begin(); lp != BaseClass::end() ; lp = lpNext) { lpNext++; @@ -99,7 +99,7 @@ BaseIncomingSet<_INCLASS1,_IN_LISTEN,MESSAGE_READER_BUF,MESSAGE_READER_UPPASS>:: template BaseIncomingSet<_INCLASS1,_IN_LISTEN,MESSAGE_READER_BUF,MESSAGE_READER_UPPASS>::~BaseIncomingSet() { - for(iterator ii = begin(); ii != end(); ii++) + for(iterator ii = BaseClass::begin(); ii != BaseClass::end(); ii++) delete *ii; } //////////////////////////////////////////////////////////////////// @@ -170,7 +170,7 @@ inline void BaseIncomingSet<_INCLASS1,_IN_LISTEN,MESSAGE_READER_BUF,MESSAGE_REA set1.setForSocket(_Listener); iterator lp; - for (lp = begin(); lp != end(); lp = lp++) + for (lp = BaseClass::begin(); lp != BaseClass::end(); lp = lp++) set1.setForSocket((*lp)->val); } @@ -189,7 +189,7 @@ inline void BaseIncomingSet<_INCLASS1,_IN_LISTEN,MESSAGE_READER_BUF,MESSAGE_READ { _Listener.Close(); iterator lpNext, lp; - for (lpNext = lp = begin(); lp != end() ; lp = lpNext) + for (lpNext = lp = BaseClass::begin(); lp != BaseClass::end() ; lp = lpNext) { lpNext++; (*lp)->Reset(); diff --git a/direct/src/http/http_request.cxx b/direct/src/http/http_request.cxx index 9312f2e13a..842e8e0c17 100644 --- a/direct/src/http/http_request.cxx +++ b/direct/src/http/http_request.cxx @@ -10,7 +10,7 @@ typedef BaseIncomingSet< Http_Request , Socket_TCP_Listen , char [10240], char *> Http_Source_BaseIncomingSet; -static std::set< Http_Request * > Global_WebRequests_pendingNotify; +std::set< Http_Request * > Global_WebRequests_pendingNotify; static Http_Source_BaseIncomingSet Global_HttpManager; bool Http_Request::HttpManager_Initialize( unsigned short port)