summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-09-19 15:20:43 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-09-19 15:20:43 -0700
commit938f1b4f41683e1a3aaa424d3d7bac5b0772d09c (patch)
treeef76e5ebd508dd631ce6d3034179fce91a183b3d /indra
parent712d4585950230ebd5ba66b3c60982ebcf6ebce9 (diff)
Mac build fix for picky gcc
Diffstat (limited to 'indra')
-rw-r--r--indra/llxuixml/llinitparam.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index fd4482f592..69dcd474f7 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -302,7 +302,7 @@ namespace LLInitParam
}
private:
- friend BaseBlock;
+ friend class BaseBlock;
U32 mEnclosingBlockOffset:31;
U32 mIsProvided:1;
@@ -1604,7 +1604,7 @@ namespace LLInitParam
};
- class Flag : public FlagBase
+ class Flag : public BaseBlockWithFlags::FlagBase
{
public:
Flag(const char* name) : FlagBase(name, DERIVED_BLOCK::selfBlockDescriptor().mCurrentBlockPtr)