projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.23
[fms.git]
/
include
/
freenet
/
iindexrequester.h
diff --git
a/include/freenet/iindexrequester.h
b/include/freenet/iindexrequester.h
index
678e43e
..
6173868
100644
(file)
--- a/
include/freenet/iindexrequester.h
+++ b/
include/freenet/iindexrequester.h
@@
-14,6
+14,8
@@
#include <Poco/Timestamp.h>
\r
#include <Poco/Timespan.h>
\r
\r
#include <Poco/Timestamp.h>
\r
#include <Poco/Timespan.h>
\r
\r
+#include <algorithm>
\r
+
\r
#ifdef XMEM
\r
#include <xmem.h>
\r
#endif
\r
#ifdef XMEM
\r
#include <xmem.h>
\r
#endif
\r
@@
-82,7
+84,7
@@
void IIndexRequester<IDTYPE>::FCPConnected()
}
\r
if(m_fcpuniquename.find("|")!=std::string::npos)
\r
{
\r
}
\r
if(m_fcpuniquename.find("|")!=std::string::npos)
\r
{
\r
- m_log->fatal("IIndexRequester<IDTYPE>::FCPConnected fcpuniquename contains | character! This is not a valid character!");
\r
+ m_log->fatal("IIndexRequester<IDTYPE>::FCPConnected fcpuniquename
"+m_fcpuniquename+"
contains | character! This is not a valid character!");
\r
}
\r
\r
m_lastreceived=Poco::Timestamp();
\r
}
\r
\r
m_lastreceived=Poco::Timestamp();
\r
@@
-208,11
+210,16
@@
void IIndexRequester<IDTYPE>::RegisterWithThread(FreenetMasterThread *thread)
template <class IDTYPE>
\r
void IIndexRequester<IDTYPE>::RemoveFromRequestList(const IDTYPE id)
\r
{
\r
template <class IDTYPE>
\r
void IIndexRequester<IDTYPE>::RemoveFromRequestList(const IDTYPE id)
\r
{
\r
+/*
\r
typename std::vector<IDTYPE>::iterator i=m_requesting.begin();
\r
while(i!=m_requesting.end() && (*i)!=id)
\r
{
\r
i++;
\r
}
\r
typename std::vector<IDTYPE>::iterator i=m_requesting.begin();
\r
while(i!=m_requesting.end() && (*i)!=id)
\r
{
\r
i++;
\r
}
\r
+*/
\r
+ // better
\r
+ typename std::vector<IDTYPE>::iterator i=std::find(m_requesting.begin(),m_requesting.end(),id);
\r
+
\r
if(i!=m_requesting.end())
\r
{
\r
m_requesting.erase(i);
\r
if(i!=m_requesting.end())
\r
{
\r
m_requesting.erase(i);
\r