From 938f1b4f41683e1a3aaa424d3d7bac5b0772d09c Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 19 Sep 2011 15:20:43 -0700
Subject: [PATCH] Mac build fix for picky gcc
---
indra/llxuixml/llinitparam.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index fd4482f592c..69dcd474f7d 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)
--
GitLab