diff options
| author | Richard Nelson <none@none> | 2010-06-04 14:26:14 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-04 14:26:14 -0700 |
| commit | 9dd68124d18ca9b2d9a252f392cc71cc24928cd5 (patch) | |
| tree | 69c35919ff281e7a08bd0a8dc48a040b892f5c55 /indra/llcommon | |
| parent | ceb6647ac1d61b43f6beb130466a7cf7c4fa15ac (diff) | |
| parent | 1be76eccdfed4d02f7ff8e34a29528887dd8d26c (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/llcommon')
| -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; |