diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
| commit | 4942a7b77917f9a163453ecdd040993965672cc0 (patch) | |
| tree | 3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llcommon/linden_common.h | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llcommon/linden_common.h')
| -rw-r--r-- | indra/llcommon/linden_common.h | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 5826bc917d..73dfc53c61 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -11,34 +11,42 @@ #include "llpreprocessor.h" -#include <string.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> +#include <cstring> +#include <cfloat> +#include <climits> +#include <cmath> +#include <cstdarg> +#include <cstdio> +#include <cstdlib> +#include <ctime> +#include <iostream> +#include <fstream> // Work around stupid Microsoft STL warning #ifdef LL_WINDOWS #pragma warning (disable : 4702) // warning C4702: unreachable code #endif // LL_WINDOWS -#include <iostream> -#include <fstream> +#include <algorithm> +#include <list> +#include <map> #include <vector> #include <string> -#include "llfile.h" +#ifdef LL_WINDOWS +#pragma warning (3 : 4702) // we like level 3, not 4 +#endif // LL_WINDOWS + +// Linden only libs in alpha-order other than stdtypes.h #include "stdtypes.h" #include "lldefs.h" #include "llerror.h" #include "llextendedstatus.h" +#include "llfasttimer.h" +#include "llfile.h" #include "llformat.h" #include "llstring.h" -#include "lltimer.h" -#include "llfasttimer.h" #include "llsys.h" - -#ifdef LL_WINDOWS -#pragma warning (3 : 4702) // we like level 3, not 4 -#endif // LL_WINDOWS +#include "lltimer.h" #endif |