RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile on gcc

This commit is contained in:
David Rose 2007-08-28 19:03:18 +00:00
parent 3f9ff877fd
commit 0f45267a6a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/http/baseincomingset.h
View File

@ -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);

8
direct/src/http/baseincomingset.i
View File

@ -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 <class _INCLASS1,class _IN_LISTEN,typename MESSAGE_READER_BUF, typename MESSAGE_READER_UPPASS>
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();

2
direct/src/http/http_request.cxx
View File

@ -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)