summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-10 19:52:58 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-10 19:52:58 -0800
commit37ac878ec06138e35507f0dd007556cc613ee08f (patch)
treeaf8043de79d9f7647fb6414187445f38d1d9aa2b
parent28f7977d6fe671932d60339f99bd73de1eb3780b (diff)
Fix for Windows compile error.
-rw-r--r--indra/llprimitive/tests/llmediaentry_test.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp
index dfac5f26c7..277e370ca4 100644
--- a/indra/llprimitive/tests/llmediaentry_test.cpp
+++ b/indra/llprimitive/tests/llmediaentry_test.cpp
@@ -9,7 +9,14 @@
#include "linden_common.h"
#include "lltut.h"
-#include "boost/lexical_cast.hpp"
+#if LL_WINDOWS
+#pragma warning (push)
+#pragma warning (disable : 4702) // boost::lexical_cast generates this warning
+#endif
+#include <boost/lexical_cast.hpp>
+#if LL_WINDOWS
+#pragma warning (pop)
+#endif
#include "llstring.h"
#include "llsdutil.h"
#include "llsdserialize.h"