Skip to content
Snippets Groups Projects
Commit 7a43d38e authored by Richard Nelson's avatar Richard Nelson
Browse files

another fix for build

parent 75d2382d
No related branches found
No related tags found
No related merge requests found
...@@ -56,6 +56,8 @@ class LLInstanceTracker : public LLInstanceTrackerBase ...@@ -56,6 +56,8 @@ class LLInstanceTracker : public LLInstanceTrackerBase
class instance_iter : public boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag> class instance_iter : public boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag>
{ {
public: public:
typedef boost::iterator_facade<instance_iter, T, boost::forward_traversal_tag> super_t;
instance_iter(typename InstanceMap::iterator& it) instance_iter(typename InstanceMap::iterator& it)
: mIterator(it) : mIterator(it)
{ {
...@@ -67,6 +69,13 @@ class LLInstanceTracker : public LLInstanceTrackerBase ...@@ -67,6 +69,13 @@ class LLInstanceTracker : public LLInstanceTrackerBase
--sIterationNestDepth; --sIterationNestDepth;
} }
instance_iter& operator =(const instance_iter& other)
{
mIterator = other.mIterator;
++sIterationNestDepth;
super_t::operator=(other);
}
private: private:
friend class boost::iterator_core_access; friend class boost::iterator_core_access;
...@@ -87,17 +96,33 @@ class LLInstanceTracker : public LLInstanceTrackerBase ...@@ -87,17 +96,33 @@ class LLInstanceTracker : public LLInstanceTrackerBase
class key_iter : public boost::iterator_facade<key_iter, KEY, boost::forward_traversal_tag> class key_iter : public boost::iterator_facade<key_iter, KEY, boost::forward_traversal_tag>
{ {
public: public:
typedef boost::iterator_facade<key_iter, KEY, boost::forward_traversal_tag> super_t;
key_iter(typename InstanceMap::iterator& it) key_iter(typename InstanceMap::iterator& it)
: mIterator(it) : mIterator(it)
{ {
++sIterationNestDepth; ++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() ~key_iter()
{ {
--sIterationNestDepth; --sIterationNestDepth;
} }
private: private:
friend class boost::iterator_core_access; friend class boost::iterator_core_access;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment