#include <Poco/Timestamp.h>\r
#include <Poco/Timespan.h>\r
\r
+#include <algorithm>\r
+\r
#ifdef XMEM\r
#include <xmem.h>\r
#endif\r
std::vector<IDTYPE> m_requesting; // list of ids we are currently requesting from\r
\r
// these MUST be populated by child class\r
- long m_maxrequests;\r
+ int m_maxrequests;\r
std::string m_fcpuniquename;\r
\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
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
+*/\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