diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-07 11:27:42 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-07 11:27:42 -0700 |
| commit | 085b2c24f9ded3d0e9a33500a287aaa53e8b7fba (patch) | |
| tree | 0f2ad3881231003f14c3bd9a96d2f284114facbd /indra/llcommon/llstring.h | |
| parent | 4db92e5155f604492cbc8f5053bcd24237e3c3b6 (diff) | |
| parent | ea5d8a1634a0457e57251b7a7ce76631cfd3f745 (diff) | |
Merge from viewer-public
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 4 |
1 files changed, 2 insertions, 2 deletions
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<T> null; + static const std::basic_string<T> null; typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t; LL_COMMON_API static void getTokens(const std::basic_string<T>& instr, std::vector<std::basic_string<T> >& tokens, const std::basic_string<T>& delims); @@ -371,7 +371,7 @@ private: LL_COMMON_API static size_type getSubstitution(const std::basic_string<T>& instr, size_type& start, std::vector<std::basic_string<T> >& tokens); }; -template<class T> std::basic_string<T> LLStringUtilBase<T>::null; +template<class T> const std::basic_string<T> LLStringUtilBase<T>::null; template<class T> std::string LLStringUtilBase<T>::sLocale; typedef LLStringUtilBase<char> LLStringUtil; |