summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-10 13:03:16 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-10 13:03:16 -0800
commit25d8cf689aa04a1bd4ebb336714730d29040d05c (patch)
treee3e6c2b39238d736091ad9cfd765a0f711ef759d /indra/llui
parentcaa468a5f184a1c2dd2cd1f2c4a7aafc5acf05d0 (diff)
further fixes in gcc land
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lllayoutstack.cpp2
-rw-r--r--indra/llui/lllayoutstack.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 5999e1a29e..9399ace1f7 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -792,7 +792,7 @@ void LLLayoutStack::calcMinExtents()
//static
void LLLayoutStack::updateClass()
{
- for (LLInstanceTracker::instance_iter it = beginInstances(); it != endInstances(); ++it)
+ for (LLInstanceTracker<LLLayoutStack>::instance_iter it = beginInstances(); it != endInstances(); ++it)
{
(*it)->updateLayout();
}
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index 8475079f5e..3a073fa1b2 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -38,7 +38,7 @@
class LLPanel;
-class LLLayoutStack : public LLView, LLInstanceTracker<LLLayoutStack>
+class LLLayoutStack : public LLView, public LLInstanceTracker<LLLayoutStack>
{
public:
struct Params : public LLInitParam::Block<Params, LLView::Params>