2 files changed, 8 insertions, 9 deletions

diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 5187948..d73cc22 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -967,7 +967,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/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index c1f1821..4ce15b9 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -221,16 +221,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
@@ -472,7 +471,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;
                         }
                 }
@@ -551,7 +550,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;