diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-02-23 19:01:09 +0200 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-02-23 19:01:09 +0200 |
| commit | daa5051e51dddd51b900410bff3a89e3f7220139 (patch) | |
| tree | c2ecb40806cd72631d1804d185a9d039d4a66a96 | |
| parent | bbb6a7efb01623eab72c4d06cc2965f31cceeeac (diff) | |
| parent | 57a81ed44da18beb26f18d16b0dde6f5a0c538e0 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/lllogchat.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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> |