diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-24 10:33:14 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-24 10:33:14 -0800 |
| commit | 5ba0c01ae879215a703ce6e68bbf4f7bd8dd8207 (patch) | |
| tree | baf6070a52a8649706b055c360868c9ce14c1c59 /indra/newview/lllogchat.cpp | |
| parent | 469af6771d757dd951daaed3e2b1d59ee2127c0e (diff) | |
| parent | 6575b685e91d334198789c88dec2efab7e5a1ac9 (diff) | |
merge with viewer 2 (fix windows build)
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> |