changed post fixed operator++ into prefixed. More efficient on some systems. Patch from Phenom.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7630 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-10-24 22:07:26 +00:00
parent 880efee332
commit d547cb6fdb
82 changed files with 717 additions and 718 deletions

View file

@ -64,7 +64,7 @@ ContentValue::ContentValue(const ContentValue &from){
char *src = NULL;
uint32_t data_len = 0;
for(; cit != keyTypeMap.end(); cit++){
for(; cit != keyTypeMap.end(); ++cit){
type = cit->second;
currKey = cit->first;
@ -303,7 +303,7 @@ void ContentValue::clearData(){
std::map<std::string, std::pair<uint32_t, char*> >::iterator
mit = mKvData.begin();
for(; mit != mKvData.end(); mit++){
for(; mit != mKvData.end(); ++mit){
if(mit->second.first != 0)
delete[] (mit->second.second);

View file

@ -179,13 +179,13 @@ RetroCursor* RetroDb::sqlQuery(const std::string& tableName, const std::list<std
sqlite3_stmt* stmt = NULL;
std::list<std::string>::const_iterator it = columns.begin();
for(; it != columns.end(); it++){
for(; it != columns.end(); ++it){
columnSelection += *it;
it++;
++it;
if(it != columns.end())
columnSelection += ",";
it--;
--it;
}
// construct query
@ -225,11 +225,11 @@ bool RetroDb::sqlInsert(const std::string &table, const std::string& /* nullColu
// build columns part of insertion
std::string qColumns = table + "(";
for(; mit != keyTypeMap.end(); mit++){
for(; mit != keyTypeMap.end(); ++mit){
qColumns += mit->first;
mit++;
++mit;
// add comma if more columns left
if(mit == keyTypeMap.end())
@ -237,7 +237,7 @@ bool RetroDb::sqlInsert(const std::string &table, const std::string& /* nullColu
else
qColumns += ",";
mit--;
--mit;
}
// build values part of insertion
@ -283,7 +283,7 @@ bool RetroDb::execSQL_bind(const std::string &query, std::list<RetroBind*> &para
std::list<RetroBind*>::iterator lit = paramBindings.begin();
for(; lit != paramBindings.end(); lit++){
for(; lit != paramBindings.end(); ++lit){
RetroBind* rb = *lit;
if(!rb->bind(stm))
@ -351,7 +351,7 @@ void RetroDb::buildInsertQueryValue(const std::map<std::string, uint8_t> keyType
parameter = "VALUES(";
int index = 0;
for(mit=keyTypeMap.begin(); mit!=keyTypeMap.end(); mit++)
for(mit=keyTypeMap.begin(); mit!=keyTypeMap.end(); ++mit)
{
uint8_t type = mit->second;
@ -400,14 +400,14 @@ void RetroDb::buildInsertQueryValue(const std::map<std::string, uint8_t> keyType
{
paramBindings.push_back(rb);
mit++;
++mit;
if(mit == keyTypeMap.end())
parameter += "?";
else
parameter += "?,";
mit--;
--mit;
}
}
@ -423,7 +423,7 @@ void RetroDb::buildUpdateQueryValue(const std::map<std::string, uint8_t> keyType
std::map<std::string, uint8_t>::const_iterator mit = keyTypeMap.begin();
int index = 0;
for(mit=keyTypeMap.begin(); mit!=keyTypeMap.end(); mit++)
for(mit=keyTypeMap.begin(); mit!=keyTypeMap.end(); ++mit)
{
uint8_t type = mit->second;
@ -472,14 +472,14 @@ void RetroDb::buildUpdateQueryValue(const std::map<std::string, uint8_t> keyType
{
paramBindings.push_back(rb);
mit++;
++mit;
if(mit == keyTypeMap.end())
parameter += key + "=?";
else
parameter += key + "=?,";
mit--;
--mit;
}
}

View file

@ -317,7 +317,7 @@ template<class Key, class Value> bool RsMemCache<Key, Value>::update_lrumap(cons
typename std::multimap<time_t, Key>::iterator sit = mLruMap.lower_bound(old_ts);
typename std::multimap<time_t, Key>::iterator eit = mLruMap.upper_bound(old_ts);
for(mit = sit; mit != eit; mit++)
for(mit = sit; mit != eit; ++mit)
{
if (mit->second == key)
{

View file

@ -59,7 +59,7 @@ std::string RsUtil::HashId(const std::string &id, bool reverse)
if (reverse)
{
std::string::const_reverse_iterator rit;
for(rit = id.rbegin(); rit != id.rend(); rit++)
for(rit = id.rbegin(); rit != id.rend(); ++rit)
{
tohash += (*rit);
}

View file

@ -46,7 +46,7 @@ void RsTickEvent::tick_events()
{
std::multimap<time_t, uint32_t>::iterator it;
for(it = mEvents.begin(); it != mEvents.end(); it++)
for(it = mEvents.begin(); it != mEvents.end(); ++it)
{
std::cerr << "\tEvent type: ";
std::cerr << it->second << " in " << it->first - now << " secs";
@ -84,7 +84,7 @@ void RsTickEvent::tick_events()
}
}
for(it = toProcess.begin(); it != toProcess.end(); it++)
for(it = toProcess.begin(); it != toProcess.end(); ++it)
{
#ifdef DEBUG_EVENTS
std::cerr << "RsTickEvent::tick_events() calling handle_event(";