diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llptrskipmap.h | 6 | ||||
| -rw-r--r-- | indra/llcommon/llsdserialize.h | 2 |
2 files changed, 5 insertions, 3 deletions
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 |