From 966e080036a2d3aafa19ddeec634c048e1d2fd7e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 13 Nov 2009 18:43:44 -0700
Subject: Disable unreachable code in boost/lexical_cast.hpp errors in Windows

---
 ChangeLog.txt                           | 8 ++++++++
 linden/indra/newview/llpaneldirfind.cpp | 9 ++++++++-
 linden/indra/newview/llvoavatar.cpp     | 7 +++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index dd6630d..da4fe09 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,14 @@
 =-                        1.3.0                           -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
+2009-11-12 McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* Disable unreachable code in boost/lexical_cast.hpp errors in Windows.
+	
+	  modified:   linden/indra/newview/llpaneldirfind.cpp
+	  modified:   linden/indra/newview/llvoavatar.cpp
+
+
 2009-11-10 McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* Viewer compiles, but still trying to get everything to link on Windows.
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index dca29ae..ee9aa69 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -63,7 +63,14 @@
 #include "llpaneldirbrowser.h"
 
 #include <boost/tokenizer.hpp>
-#include <boost/lexical_cast.hpp>
+#if LL_WINDOWS
+	// Disable warning for unreachable code in boost/lexical_cast.hpp for Boost 1.36 -- McCabe
+	#pragma warning(disable : 4702)
+#include "boost/lexical_cast.hpp"
+	#pragma warning(default : 4702)
+#else
+#include "boost/lexical_cast.hpp"
+#endif
 
 //---------------------------------------------------------------------------
 // LLPanelDirFindAll - Google search appliance based search
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 1fa7cf0..68c1dc3 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -83,7 +83,14 @@
 #include "llvoiceclient.h"
 #include "llvoicevisualizer.h" // Ventrella
 
+#if LL_WINDOWS
+	// Disable warning for unreachable code in boost/lexical_cast.hpp for Boost 1.36 -- McCabe
+	#pragma warning(disable : 4702)
 #include "boost/lexical_cast.hpp"
+	#pragma warning(default : 4702)
+#else
+#include "boost/lexical_cast.hpp"
+#endif
 // [RLVa:KB]
 #include "llstartup.h"
 // [/RLVa:KB]
-- 
cgit v1.1