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: [PATCH] another fix for build
---
indra/llcommon/llinstancetracker.h | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 47041f790f9..78a67653c8b 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -56,6 +56,8 @@ class LLInstanceTracker : public LLInstanceTrackerBase
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 @@ class LLInstanceTracker : public LLInstanceTrackerBase
--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 @@ class LLInstanceTracker : public LLInstanceTrackerBase
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;
--
GitLab