From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/lscript/lscript_compile/lscript_scope.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra/lscript/lscript_compile/lscript_scope.h')

diff --git a/indra/lscript/lscript_compile/lscript_scope.h b/indra/lscript/lscript_compile/lscript_scope.h
index c55d99577a..5a629df021 100644
--- a/indra/lscript/lscript_compile/lscript_scope.h
+++ b/indra/lscript/lscript_compile/lscript_scope.h
@@ -277,14 +277,14 @@ public:
 class LLScriptScopeEntry
 {
 public:
-	LLScriptScopeEntry(char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type, S32 count = 0)
+	LLScriptScopeEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type, S32 count = 0)
 		: mIdentifier(identifier), mIDType(idtype), mType(type), mOffset(0), mSize(0), mAssignable(NULL), mCount(count), mLibraryNumber(0)
 	{
 	}
 
 	~LLScriptScopeEntry() {}
 
-	char						*mIdentifier;
+	const char					*mIdentifier;
 	LSCRIPTIdentifierType		mIDType;
 	LSCRIPTType					mType;
 	S32							mOffset;
@@ -309,9 +309,9 @@ public:
 		mEntryMap.deleteAllData();
 	}
 
-	LLScriptScopeEntry *addEntry(char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type)
+	LLScriptScopeEntry *addEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type)
 	{
-		char *name = mSTable->addString(identifier);
+		const char *name = mSTable->addString(identifier);
 		if (!mEntryMap.checkData(name))
 		{
 			if (idtype == LIT_FUNCTION)
@@ -329,9 +329,9 @@ public:
 		}
 	}
 
-	BOOL checkEntry(char *identifier)
+	BOOL checkEntry(const char *identifier)
 	{
-		char *name = mSTable->addString(identifier);
+		const char *name = mSTable->addString(identifier);
 		if (mEntryMap.checkData(name))
 		{
 			return TRUE;
@@ -343,9 +343,9 @@ public:
 		}
 	}
 
-	LLScriptScopeEntry *findEntry(char *identifier)
+	LLScriptScopeEntry *findEntry(const char *identifier)
 	{
-		char			*name = mSTable->addString(identifier);
+		const char		*name = mSTable->addString(identifier);
 		LLScriptScope	*scope = this;
 
 		while (scope)
@@ -360,9 +360,9 @@ public:
 		return NULL;
 	}
 
-	LLScriptScopeEntry *findEntryTyped(char *identifier, LSCRIPTIdentifierType idtype)
+	LLScriptScopeEntry *findEntryTyped(const char *identifier, LSCRIPTIdentifierType idtype)
 	{
-		char			*name = mSTable->addString(identifier);
+		const char		*name = mSTable->addString(identifier);
 		LLScriptScope	*scope = this;
 
 		while (scope)
@@ -397,7 +397,7 @@ public:
 		mParentScope = scope;
 	}
 
-	LLMap<char *, LLScriptScopeEntry *>	mEntryMap;
+	LLMap<const char *, LLScriptScopeEntry *>	mEntryMap;
 	LLScriptScope						*mParentScope;
 	LLStringTable						*mSTable;
 	S32									mFunctionCount;
-- 
cgit v1.2.3