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/llerror.cpp | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llcommon/llerror.cpp')
| -rw-r--r-- | indra/llcommon/llerror.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 90ea72f24c..98972950b7 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -12,33 +12,28 @@ #include "llerror.h" #include "llerrorcontrol.h" -#include "llapp.h" -#include "llapr.h" -#include "llfile.h" -#include "llfixedbuffer.h" -#include "lllivefile.h" -#include "llsd.h" -#include "llsdserialize.h" -#include "llstl.h" - -#include <algorithm> #include <cctype> -#include <map> +#ifdef __GNUC__ +#include <cxxabi.h> +#endif #include <sstream> #if !LL_WINDOWS -#include <stdio.h> #include <syslog.h> #endif -#include <time.h> #if LL_WINDOWS #include <windows.h> #endif #include <vector> +#include "llapp.h" +#include "llapr.h" +#include "llfile.h" +#include "llfixedbuffer.h" +#include "lllivefile.h" +#include "llsd.h" +#include "llsdserialize.h" +#include "llstl.h" -#ifdef __GNUC__ -#include <cxxabi.h> -#endif namespace { #if !LL_WINDOWS |