From 58a2ba9581ff9288c331cf7b92b6b14bb5f5e9a3 Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Wed, 9 Sep 2009 11:54:23 +0000
Subject: 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.
---
 indra/llcommon/llstring.h             | 4 ++--
 indra/newview/llfloaterpreference.cpp | 1 +
 indra/newview/llnavigationbar.cpp     | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 3b1379c76a..d0def896cf 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -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;
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d389cf06ec..e2e9734012 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -103,6 +103,7 @@
 #include "llviewermedia.h"
 #include "llpluginclassmedia.h"
 
+#include <boost/regex.hpp>
 
 //RN temporary includes for resolution switching
 #include "llglheaders.h"
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 0da572dd24..69cebcfb5e 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -62,6 +62,8 @@
 #include "llfavoritesbar.h"
 #include "llagentui.h"
 
+#include <boost/regex.hpp>
+
 //-- LLTeleportHistoryMenuItem -----------------------------------------------
 
 /**
-- 
cgit v1.2.3