From cbf7e90954e69f86cbf530676e165f2feb6501bb Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Fri, 20 Sep 2013 05:58:32 +0000
Subject: Used a c++11 feature unintentionally.  Use a more traditional
 swap-less object transfer.

---
 indra/newview/llmeshrepository.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llmeshrepository.cpp')

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 5174a7af00..23a9640761 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2471,16 +2471,25 @@ void LLMeshRepoThread::notifyLoadedMeshes()
 
 	if (! mSkinInfoQ.empty() || ! mDecompositionQ.empty())
 	{
-		std::queue<LLMeshSkinInfo> skin_info_q;
-		std::queue<LLModel::Decomposition*> decomp_q;
-
 		if (mMutex->trylock())
 		{
-			// Make thread-shared data private with swap under lock.
-			skin_info_q.swap(mSkinInfoQ);
-			decomp_q.swap(mDecompositionQ);
+			std::queue<LLMeshSkinInfo> skin_info_q;
+			std::queue<LLModel::Decomposition*> decomp_q;
+
+			// swap() comes to std::queue in c++11 so copy manually for now
+			while (! mSkinInfoQ.empty())
+			{
+				skin_info_q.push(mSkinInfoQ.front());
+				mSkinInfoQ.pop();
+			}
+			while (! mDecompositionQ.empty())
+			{
+				decomp_q.push(mDecompositionQ.front());
+				mDecompositionQ.pop();
+			}
 			mMutex->unlock();
 
+			// Process the elements free of the lock
 			while (! skin_info_q.empty())
 			{
 				gMeshRepo.notifySkinInfoReceived(skin_info_q.front());
-- 
cgit v1.2.3