livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DEV-39441: Removed include for boost/regex.hpp from llstring.h (and 

fixed up viewer files that relied on this being included for them).
Also changed LLStringUtil::getSubstitution() to be a private method.

Reviewed by steve.
master
Martin Reddy 2009-09-09 11:54:23 +00:00
parent f7231263d4
commit 58a2ba9581
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/llstring.h
View File

@ -36,7 +36,6 @@
#include <string>
#include <locale>
#include <iomanip>
#include <boost/regex.hpp>
#include "llsd.h"
#include "llfasttimer.h"
@ -232,7 +231,6 @@ public:
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 size_type getSubstitution(const std::basic_string<T>& instr, size_type& start, std::vector<std::basic_string<T> >& tokens);
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);
@ -347,6 +345,8 @@ public:
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);
};
template<class T> std::basic_string<T> LLStringUtilBase<T>::null;

1
indra/newview/llfloaterpreference.cpp
View File

@ -103,6 +103,7 @@
#include "llviewermedia.h"
#include "llpluginclassmedia.h"
#include <boost/regex.hpp>
//RN temporary includes for resolution switching
#include "llglheaders.h"

2
indra/newview/llnavigationbar.cpp
View File

@ -62,6 +62,8 @@
#include "llfavoritesbar.h"
#include "llagentui.h"
#include <boost/regex.hpp>
//-- LLTeleportHistoryMenuItem -----------------------------------------------
/**