svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

2 files changed, 8 insertions, 9 deletions

diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp
index 514fb10b4a..451fb2e807 100644
--- a/indra/llmessage/llcircuit.cpp
+++ b/indra/llmessage/llcircuit.cpp
@@ -948,7 +948,7 @@ BOOL LLCircuitData::updateWatchDogTimers(LLMessageSystem *msgsys)
 					<< (*it).first;
 				llinfos << str.str().c_str() << llendl;
 			}
-			mPotentialLostPackets.erase((*(it++)).first);
+			mPotentialLostPackets.erase(it++);
 		}
 		else
 		{
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp
index 320719072c..1be6c21cc2 100644
--- a/indra/llmessage/llpumpio.cpp
+++ b/indra/llmessage/llpumpio.cpp
@@ -202,16 +202,15 @@ bool LLPumpIO::setConditional(LLIOPipe* pipe, const apr_pollfd_t* poll)
 	{
 		// remove any matching poll file descriptors for this pipe.
 		LLIOPipe::ptr_t pipe_ptr(pipe);
-
-		LLChainInfo::conditionals_t::iterator it = (*mCurrentChain).mDescriptors.begin();
-		LLChainInfo::conditionals_t::iterator end = (*mCurrentChain).mDescriptors.end();
-		while (it != end)
+		LLChainInfo::conditionals_t::iterator it;
+		it = (*mCurrentChain).mDescriptors.begin();
+		while(it != (*mCurrentChain).mDescriptors.end())
 		{
 			LLChainInfo::pipe_conditional_t& value = (*it);
-			if ( pipe_ptr == value.first )
+			if(pipe_ptr == value.first)
 			{
 				ll_delete_apr_pollset_fd_client_data()(value);
-				(*mCurrentChain).mDescriptors.erase(it++);
+				it = (*mCurrentChain).mDescriptors.erase(it);
 				mRebuildPollset = true;
 			}
 			else
@@ -453,7 +452,7 @@ void LLPumpIO::pump()
 //						<< (*run_chain).mChainLinks[0].mPipe
 //						<< " because we reached the end." << llendl;
 #endif
-				mRunningChains.erase(run_chain++);
+				run_chain = mRunningChains.erase(run_chain);
 				continue;
 			}
 		}
@@ -532,7 +531,7 @@ void LLPumpIO::pump()
 				(*run_chain).mDescriptors.begin(),
 				(*run_chain).mDescriptors.end(),
 				ll_delete_apr_pollset_fd_client_data());
-			mRunningChains.erase(run_chain++);
+			run_chain = mRunningChains.erase(run_chain);
 
 			// *NOTE: may not always need to rebuild the pollset.
 			mRebuildPollset = true;