diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 19:26:04 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 19:26:04 -0700 |
| commit | 902d6676c653ce2ca34b3645576e59bcc93dc2cd (patch) | |
| tree | 4986be0e63e8618a3409ce78dcebcf18b773d90f /indra/newview | |
| parent | 50247533f99f374be71728cc5ca00f0444189a9f (diff) | |
Post-merge cleanup to get things building again.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmediadataclient.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/tests/lldateutil_test.cpp | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp index da5e68af71..2f2be0561d 100644 --- a/indra/newview/llmediadataclient.cpp +++ b/indra/newview/llmediadataclient.cpp @@ -34,6 +34,11 @@ #include "llmediadataclient.h" +#if LL_MSVC +// disable boost::lexical_cast warning +#pragma warning (disable:4702) +#endif + #include <boost/lexical_cast.hpp> #include "llhttpstatuscodes.h" diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp index 30e39a3bcf..ed753b6ff7 100644 --- a/indra/newview/tests/lldateutil_test.cpp +++ b/indra/newview/tests/lldateutil_test.cpp @@ -28,6 +28,9 @@ * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ */ + +#include "linden_common.h" + #include "../test/lltut.h" #include "../lldateutil.h" |