diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llstring.h | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 181d6fd33f..d280c51226 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -230,13 +230,13 @@ public:  	static std::basic_string<T> null;
  	typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t;
 -	static void getTokens(const std::basic_string<T>& instr, std::vector<std::basic_string<T> >& tokens, const std::basic_string<T>& delims);
 -	static void formatNumber(std::basic_string<T>& numStr, std::basic_string<T> decimals);
 -	static bool formatDatetime(std::basic_string<T>& replacement, std::basic_string<T> token, std::basic_string<T> param, S32 secFromEpoch);
 -	static S32 format(std::basic_string<T>& s, const format_map_t& substitutions);
 -	static S32 format(std::basic_string<T>& s, const LLSD& substitutions);
 -	static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const format_map_t& substitutions);
 -	static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const LLSD& substitutions);
 +	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);
 +	LL_COMMON_API static void formatNumber(std::basic_string<T>& numStr, std::basic_string<T> decimals);
 +	LL_COMMON_API static bool formatDatetime(std::basic_string<T>& replacement, std::basic_string<T> token, std::basic_string<T> param, S32 secFromEpoch);
 +	LL_COMMON_API static S32 format(std::basic_string<T>& s, const format_map_t& substitutions);
 +	LL_COMMON_API static S32 format(std::basic_string<T>& s, const LLSD& substitutions);
 +	LL_COMMON_API static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const format_map_t& substitutions);
 +	LL_COMMON_API static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const LLSD& substitutions);
  	static void setLocale (std::string inLocale) {sLocale = inLocale;};
  	static std::string getLocale (void) {return sLocale;};
 @@ -342,11 +342,11 @@ public:  #ifdef _DEBUG	
 -	static void		testHarness();
 +	LL_COMMON_API static void		testHarness();
  #endif
  private:
 -	static size_type getSubstitution(const std::basic_string<T>& instr, size_type& start, std::vector<std::basic_string<T> >& tokens);
 +	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;
 | 
