diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 08:57:27 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 08:57:27 +0000 |
| commit | a7bca7055adbceee0fe09a6078158ffe8d0eacef (patch) | |
| tree | 4facac85effad80ad3d185794edc2ae90bddac1e /indra/newview/lllogchat.cpp | |
| parent | 245fe3edc6fa7333c16efcc90a4a52db8450a828 (diff) | |
| parent | 1d45b1edcd3570b27622c0e99cf0bd5aee331cc1 (diff) | |
PE merge. Conflict resolved.
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -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> |