diff options
author | Martin Reddy <lynx@lindenlab.com> | 2009-09-23 13:57:06 +0000 |
---|---|---|
committer | Martin Reddy <lynx@lindenlab.com> | 2009-09-23 13:57:06 +0000 |
commit | 47abd559082f6023dcdfadd2ec740195b1d07990 (patch) | |
tree | 244c81063dd56a8095a8fc137d89ad87c0e024c5 /indra/llui/llurlentry.h | |
parent | 658849ee953da606035efba20a6e599ea7e9eb0f (diff) |
EXT-944 EXT-1026: reverting my previous fix for these crashes.
This didn't work on Windows because wchar_t is 2 bytes on that
platform, not 4 bytes (whereas llwchar is 4 bytes everywhere).
Boost's regex methods need to work on wchar_t, but I believe
that using a UTF-16 string would still be prone to crashing on
Windows as UTF-16 is still a variable-length encoding. Besides,
trying to compile a UTF-16 solution generates weird link errors.
Instead, I'm going to fix this problem a different way. And
I'm starting by reverting the previous attempt. Thanks Win32.
Diffstat (limited to 'indra/llui/llurlentry.h')
-rw-r--r-- | indra/llui/llurlentry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 36758566ed..54053872df 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -68,7 +68,7 @@ public: virtual ~LLUrlEntryBase(); /// Return the regex pattern that matches this Url - boost::wregex getPattern() const { return mPattern; } + boost::regex getPattern() const { return mPattern; } /// Return the url from a string that matched the regex virtual std::string getUrl(const std::string &string); @@ -102,7 +102,7 @@ protected: LLUrlLabelSignal *signal; } LLUrlEntryObserver; - boost::wregex mPattern; + boost::regex mPattern; std::string mIcon; std::string mMenuName; std::string mTooltip; |