diff options
| author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
| commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
| tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llcommon/linden_common.h | |
| parent | Second Life viewer sources 1.20.15 (diff) | |
| download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz | |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llcommon/linden_common.h')
| -rw-r--r-- | linden/indra/llcommon/linden_common.h | 5 |
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> |