From 875606a04d656ef6e5600a3a7fb6e8b52feb1945 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 11 May 2008 20:56:42 +0000
Subject: QAR-566 maint-viewer-5-merge-2 Effective merge: release@84102
 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge
 maint-viewer-5-merge-2 -r 87239 : 87246 -> release

---
 indra/llcommon/llptrskipmap.h  | 6 ++++--
 indra/llcommon/llsdserialize.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llptrskipmap.h b/indra/llcommon/llptrskipmap.h
index e505004b63..b511d686ae 100644
--- a/indra/llcommon/llptrskipmap.h
+++ b/indra/llcommon/llptrskipmap.h
@@ -238,7 +238,8 @@ private:
 template <class INDEX_T, class DATA_T, S32 BINARY_DEPTH>
 inline LLPtrSkipMap<INDEX_T, DATA_T, BINARY_DEPTH>::LLPtrSkipMap()
 	:	mInsertFirst(NULL),
-		mEquals(defaultEquals)
+		mEquals(defaultEquals),
+		mNumberOfSteps(0)
 {
 	if (BINARY_DEPTH < 2)
 	{
@@ -259,7 +260,8 @@ template <class INDEX_T, class DATA_T, S32 BINARY_DEPTH>
 inline LLPtrSkipMap<INDEX_T, DATA_T, BINARY_DEPTH>::LLPtrSkipMap(insert_func insert_first, 
 																 equals_func equals) 
 :	mInsertFirst(insert_first),
-	mEquals(equals)
+	mEquals(equals),
+	mNumberOfSteps(0)
 {
 	if (BINARY_DEPTH < 2)
 	{
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index 26ce1dc993..5e88070130 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -390,7 +390,7 @@ public:
 	/**
 	 * Options for output
 	 */
-	enum e_formatter_options_type
+	typedef enum e_formatter_options_type
 	{
 		OPTIONS_NONE = 0,
 		OPTIONS_PRETTY = 1
-- 
cgit v1.2.3