From 7a43d38eaa7fc9bcdaaf21a0f915cc44bb7d3778 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 27 Jul 2011 10:25:45 -0700
Subject:        another fix for build

---
 indra/llcommon/llinstancetracker.h | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'indra/llcommon/llinstancetracker.h')

diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 47041f790f..78a67653c8 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -56,6 +56,8 @@ public:
 	class instance_iter : public boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag>
 	{
 	public:
+		typedef boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag> super_t;
+		
 		instance_iter(typename InstanceMap::iterator& it)
 		:	mIterator(it)
 		{
@@ -67,6 +69,13 @@ public:
 			--sIterationNestDepth;
 		}
 
+		instance_iter& operator =(const instance_iter& other)
+		{
+			mIterator = other.mIterator;
+			++sIterationNestDepth;
+			super_t::operator=(other);
+		}
+
 	private:
 		friend class boost::iterator_core_access;
 
@@ -87,17 +96,33 @@ public:
 	class key_iter : public boost::iterator_facade<key_iter, KEY, boost::forward_traversal_tag>
 	{
 	public:
+		typedef boost::iterator_facade<key_iter, KEY, boost::forward_traversal_tag> super_t;
+
 		key_iter(typename InstanceMap::iterator& it)
 			:	mIterator(it)
 		{
 			++sIterationNestDepth;
 		}
 
+		key_iter(const key_iter& other)
+			:	mIterator(other.mIterator)
+		{
+			++sIterationNestDepth;
+		}
+
+		key_iter& operator =(const key_iter& other)
+		{
+			mIterator = other.mIterator;
+			++sIterationNestDepth;
+			super_t::operator=(other);
+		}
+
 		~key_iter()
 		{
 			--sIterationNestDepth;
 		}
 
+
 	private:
 		friend class boost::iterator_core_access;
 
-- 
cgit v1.3


From 061e9efd3e7b7426c69d0f57447722a3aa321d96 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 27 Jul 2011 13:11:09 -0700
Subject: broken operator= semantics for instance tracker iterators

---
 indra/llcommon/llinstancetracker.h | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'indra/llcommon/llinstancetracker.h')

diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 78a67653c8..3c3b40f66f 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -69,12 +69,6 @@ public:
 			--sIterationNestDepth;
 		}
 
-		instance_iter& operator =(const instance_iter& other)
-		{
-			mIterator = other.mIterator;
-			++sIterationNestDepth;
-			super_t::operator=(other);
-		}
 
 	private:
 		friend class boost::iterator_core_access;
@@ -110,13 +104,6 @@ public:
 			++sIterationNestDepth;
 		}
 
-		key_iter& operator =(const key_iter& other)
-		{
-			mIterator = other.mIterator;
-			++sIterationNestDepth;
-			super_t::operator=(other);
-		}
-
 		~key_iter()
 		{
 			--sIterationNestDepth;
-- 
cgit v1.3


From 61a7726611e4818466bd9fbf84d3ab7ea1b97984 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 27 Jul 2011 15:58:52 -0700
Subject: another potential gcc fix

---
 indra/llcommon/llinstancetracker.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon/llinstancetracker.h')

diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 3c3b40f66f..dc5ca037f9 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -58,7 +58,7 @@ public:
 	public:
 		typedef boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag> super_t;
 		
-		instance_iter(typename InstanceMap::iterator& it)
+		instance_iter(typename const InstanceMap::iterator& it)
 		:	mIterator(it)
 		{
 			++sIterationNestDepth;
@@ -210,7 +210,7 @@ public:
 	class instance_iter : public boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag>
 	{
 	public:
-		instance_iter(typename InstanceSet::iterator& it)
+		instance_iter(typename const InstanceSet::iterator& it)
 		:	mIterator(it)
 		{
 			++sIterationNestDepth;
-- 
cgit v1.3


From 5eec3a4e51ae73e96750118096e9ab3168943949 Mon Sep 17 00:00:00 2001
From: Aaron Stone <stone@lindenlab.com>
Date: Wed, 27 Jul 2011 16:03:01 -0700
Subject: Swap typename and const.

---
 indra/llcommon/llinstancetracker.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon/llinstancetracker.h')

diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index dc5ca037f9..b4891eba67 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -58,7 +58,7 @@ public:
 	public:
 		typedef boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag> super_t;
 		
-		instance_iter(typename const InstanceMap::iterator& it)
+		instance_iter(const typename InstanceMap::iterator& it)
 		:	mIterator(it)
 		{
 			++sIterationNestDepth;
@@ -210,7 +210,7 @@ public:
 	class instance_iter : public boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag>
 	{
 	public:
-		instance_iter(typename const InstanceSet::iterator& it)
+		instance_iter(const typename InstanceSet::iterator& it)
 		:	mIterator(it)
 		{
 			++sIterationNestDepth;
-- 
cgit v1.3