livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows lets you erase with a const iterator but linux does not.

meow-7.2.2
dolphin 2014-03-12 11:49:17 -07:00
parent 9fe5728b43
commit a0b8c3e029
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/llmessage/llexperiencecache.cpp
View File

@ -84,23 +84,6 @@ namespace LLExperienceCache
sPendingQueue.erase(row[EXPERIENCE_ID].asUUID());
}
if(row.has(OWNER_ID))
{
sPendingQueue.erase(row[OWNER_ID].asUUID());
}
if(!row.has(OWNER_ID))
{
if(row.has(AGENT_ID) && row[AGENT_ID].asUUID().notNull())
{
row[OWNER_ID]=row[AGENT_ID];
}
else
{
row[OWNER_ID]=row[GROUP_ID];
}
}
//signal
signal_map_t::iterator sig_it = sSignalMap.find(public_key);
if (sig_it != sSignalMap.end())
@ -427,7 +410,7 @@ namespace LLExperienceCache
int request_count = 0;
while(!sAskQueue.empty() && request_count < sMaximumLookups)
{
ask_queue_t::const_iterator it = sAskQueue.begin();
ask_queue_t::iterator it = sAskQueue.begin();
const LLUUID& key = it->first;
const std::string& key_type = it->second;

1
indra/llmessage/llexperiencecache.h
View File

@ -45,7 +45,6 @@ namespace LLExperienceCache
const std::string AGENT_ID = "agent_id";
const std::string GROUP_ID = "group_id";
const std::string EXPERIENCE_ID = "public_id";
const std::string OWNER_ID = "owner_id";
const std::string NAME = "name";
const std::string PROPERTIES = "properties";
const std::string EXPIRES = "expiration";