mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-22 12:56:37 -04:00
- Split majority of p3posted into p3postbase.cc - so that it can be reused by other services.
- Fixed iterator overflow into rsgxsupdateitems.cc - Fixed Mutex deadlock in pqiperson.cc - Removed old code. - Fixed lots of compile warnings - mainly wrong variable ordering in constructors. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
46518ebf51
commit
ae5942733e
24 changed files with 921 additions and 5122 deletions
|
@ -1511,7 +1511,7 @@ void p3GxsCircles::generateDummyCircle()
|
|||
|
||||
int selection = (RSRandom::random_u32() % npgps);
|
||||
std::list<RsGxsId>::iterator it = mDummyPgpLinkedIds.begin();
|
||||
for(int j = 0; (it != mDummyPgpLinkedIds.end()) && (j < selection); j++, it++);
|
||||
for(int j = 0; (it != mDummyPgpLinkedIds.end()) && (j < selection); j++, it++) ;
|
||||
if (it != mDummyPgpLinkedIds.end())
|
||||
{
|
||||
idset.insert(*it);
|
||||
|
@ -1525,7 +1525,7 @@ void p3GxsCircles::generateDummyCircle()
|
|||
int selection = (RSRandom::random_u32() % mDummyOwnIds.size());
|
||||
std::list<RsGxsId>::iterator it = mDummyOwnIds.begin();
|
||||
mDummyOwnIds.push_back(*it);
|
||||
for(int j = 0; (it != mDummyOwnIds.end()) && (j < selection); j++, it++);
|
||||
for(int j = 0; (it != mDummyOwnIds.end()) && (j < selection); j++, it++) ;
|
||||
if (it != mDummyOwnIds.end())
|
||||
{
|
||||
idset.insert(*it);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue