aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/linden_common.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcommon/linden_common.h')
-rw-r--r--linden/indra/llcommon/linden_common.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index 547cceb..7d3c82d 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -45,9 +45,10 @@
45#include <iostream> 45#include <iostream>
46#include <fstream> 46#include <fstream>
47 47
48// Work around stupid Microsoft STL warning 48// Work Microsoft compiler warnings
49#ifdef LL_WINDOWS 49#ifdef LL_WINDOWS
50#pragma warning (disable : 4702) // warning C4702: unreachable code 50#pragma warning (disable : 4702) // unreachable code
51#pragma warning (disable : 4244) // conversion from time_t to S32
51#endif // LL_WINDOWS 52#endif // LL_WINDOWS
52 53
53#include <algorithm> 54#include <algorithm>