From 57a81ed44da18beb26f18d16b0dde6f5a0c538e0 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Tue, 23 Feb 2010 18:32:55 +0200
Subject: No ticket. Fixed Windows Release build (warning treated as error)
 Warning: c:\slbuild\viewer-2-0\libraries\include\boost\lexical_cast.hpp(1159)
 : warning C4702: unreachable code Reason: additional boost lib dependence
 after changes (EXT-5215) for EXT-5215 (Disable showing full yyyy/mm/dd
 timestamp for messages (nearby chat/im)

--HG--
branch : product-engine
---
 indra/newview/lllogchat.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 16b13d9218..be8b2363ad 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -46,7 +46,17 @@
 #include <boost/regex.hpp>
 #include <boost/regex/v4/match_results.hpp>
 
+#if LL_MSVC
+// disable warning about boost::lexical_cast unreachable code
+// when it fails to parse the string
+#pragma warning (disable:4702)
+#endif
+
 #include <boost/date_time/gregorian/gregorian.hpp>
+#if LL_MSVC
+#pragma warning(pop)   // Restore all warnings to the previous state
+#endif
+
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/local_time_adjustor.hpp>
 
-- 
cgit v1.2.3