From 05d7addde73511d303f9203d0dc007ebb2e5b299 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 4 Jun 2010 12:24:40 -0700 Subject: made LLStringUtil::null const --- indra/llcommon/llstring.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index ad8f8632a2..8071c8aa2d 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -249,7 +249,7 @@ public: ///////////////////////////////////////////////////////////////////////////////////////// // Static Utility functions that operate on std::strings - static std::basic_string null; + static const std::basic_string null; typedef std::map format_map_t; LL_COMMON_API static void getTokens(const std::basic_string& instr, std::vector >& tokens, const std::basic_string& delims); @@ -371,7 +371,7 @@ private: LL_COMMON_API static size_type getSubstitution(const std::basic_string& instr, size_type& start, std::vector >& tokens); }; -template std::basic_string LLStringUtilBase::null; +template const std::basic_string LLStringUtilBase::null; template std::string LLStringUtilBase::sLocale; typedef LLStringUtilBase LLStringUtil; -- cgit v1.2.3