[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  0f59d2c8e9983cbb90d5c6ebe60017d59532e8cf (commit)
       via  fa05e9e24e9110f20ee36a3cbbc34d8dc1c37257 (commit)
      from  214d39ab9992d065f15983ed6c1672e68ff6f59f (commit)

Summary of changes:


- Log -----------------------------------------------------------------
commit 0f59d2c8e9983cbb90d5c6ebe60017d59532e8cf
Merge: fa05e9e 214d39a
Author: Mark Michelson <mmichelson at digium.com>
Date:   Sat Jun 25 16:07:35 2011 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/ice-util-cpp


commit fa05e9e24e9110f20ee36a3cbbc34d8dc1c37257
Author: Mark Michelson <mmichelson at digium.com>
Date:   Sat Jun 25 16:07:21 2011 -0500

    Fix overlooked compiler error.

diff --git a/src/ThreadPool/ThreadPool.cpp b/src/ThreadPool/ThreadPool.cpp
index 1a8b5c9..6791084 100644
--- a/src/ThreadPool/ThreadPool.cpp
+++ b/src/ThreadPool/ThreadPool.cpp
@@ -60,7 +60,7 @@ public:
         {
             boost::lock_guard<boost::mutex> lock(mQueueLock);
             mShuttingDown = true;
-            mControlQueue->shutDown();
+            mControlQueue->shutdown();
             mControlQueue = 0;
         }
 

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice-util-cpp.git