diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
| commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
| tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/llcommon/llstring.h | |
| parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) | |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index c958e08415..3005155b19 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -20,7 +20,7 @@ #include <errno.h> #include <math.h> #include <stdarg.h> /* for vsnprintf */ -#if LL_LINUX +#if LL_LINUX || LL_SOLARIS #include <wctype.h> #include <wchar.h> #endif @@ -34,7 +34,7 @@ class LLUUID; class LLColor4; class LLColor4U; -#if (LL_DARWIN || (LL_LINUX && __GNUC__ > 2)) +#if (LL_DARWIN || LL_SOLARIS || (LL_LINUX && __GNUC__ > 2)) // Template specialization of char_traits for U16s. Only necessary on Mac for now (exists on Windows, unused/broken on Linux/gcc2.95) namespace std { @@ -185,7 +185,7 @@ public: LLStringBase(const T* s, size_type n); LLStringBase(const T* s, size_type pos, size_type n ); -#if LL_LINUX +#if LL_LINUX || LL_SOLARIS void clear() { assign(null); } LLStringBase<T>& assign(const T* s); @@ -680,7 +680,7 @@ LLStringBase<T>::LLStringBase(const T* s, size_type pos, size_type n ) : std::ba } } -#if LL_LINUX +#if LL_LINUX || LL_SOLARIS template<class T> LLStringBase<T>& LLStringBase<T>::assign(const T* s) { @@ -1075,7 +1075,7 @@ BOOL LLStringBase<T>::read(std::basic_string<T>& string, const char* filename) template<class T> BOOL LLStringBase<T>::write(std::basic_string<T>& string, const char* filename) { -#ifdef LL_LINUX +#if LL_LINUX || LL_SOLARIS printf("STUBBED: LLStringBase<T>::write at %s:%d\n", __FILE__, __LINE__); #else llofstream ofs(filename, llofstream::binary); |