Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.

indra/linux_crash_logger/linux_crash_logger.cpp

@@ -8,9 +8,6 @@
 
 #include "linden_common.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

indra/llaudio/llaudiodecodemgr.cpp

@@ -7,11 +7,6 @@
 
 #include "linden_common.h"
 
-#include <vector>
-#include <iterator>
-#include <algorithm>
-#include <stdio.h>
-
 #include "llaudiodecodemgr.h"
 
 #include "vorbisdecode.h"

indra/llcharacter/llanimationstates.cpp

@@ -12,8 +12,6 @@
 
 #include "linden_common.h"
 
-#include <string.h>
-
 #include "llanimationstates.h"
 #include "llstring.h"
 

indra/llcharacter/llbvhloader.cpp

@@ -9,6 +9,9 @@
 #include "linden_common.h"
 
 #include "llbvhloader.h"
+
+#include <boost/tokenizer.hpp>
+
 #include "lldatapacker.h"
 #include "lldir.h"
 #include "llkeyframemotion.h"
@@ -16,11 +19,6 @@
 #include "llstl.h"
 #include "llapr.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <llquaternion.h>
-#include <boost/tokenizer.hpp>
 
 using namespace std;
 

indra/llcharacter/llbvhloader.h

@@ -9,11 +9,6 @@
 #ifndef LL_LLBVHLOADER_H
 #define LL_LLBVHLOADER_H
 
-#include <string>
-#include <vector>
-#include <map>
-#include <stdtypes.h>
-#include <stdio.h>
 #include "v3math.h"
 #include "m3math.h"
 #include "llmath.h"

indra/llcharacter/lljointsolverrp3.cpp

@@ -13,8 +13,6 @@
 
 #include "lljointsolverrp3.h"
 
-#include <math.h>
-
 #include "llmath.h"
 
 #define F_EPSILON 0.00001f

indra/llcommon/ctype_workaround.h

@@ -18,7 +18,7 @@
  * -- Leviathan 20060113
 */
 
-#include <ctype.h>
+#include <cctype>
 
 __const unsigned short int *__ctype_b;
 __const __int32_t *__ctype_tolower;

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

indra/llcommon/llassettype.cpp

@@ -10,8 +10,6 @@
 
 #include "llassettype.h"
 
-#include <time.h>
-
 #include "llstring.h"
 #include "lltimer.h"
 

indra/llcommon/llcriticaldamp.cpp

@@ -7,7 +7,6 @@
  */
 
 #include "linden_common.h"
-#include <math.h>
 
 #include "llcriticaldamp.h"
 

indra/llcommon/lldlinked.h

@@ -8,8 +8,6 @@
 #ifndef LL_LLDLINKED_H
 #define LL_LLDLINKED_H
 
-#include <stdlib.h>
-
 template <class Type> class LLDLinked
 {
 	LLDLinked* mNextp;

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

indra/llcommon/llfasttimer.h

@@ -9,8 +9,6 @@
 #ifndef LL_LLFASTTIMER_H
 #define LL_LLFASTTIMER_H
 
-#include "lltimer.h"
-
 #define FAST_TIMER_ON 1
 
 U64 get_cpu_clock_count();

indra/llcommon/llfile.h

@@ -17,12 +17,6 @@
  * Attempts to mostly mirror the POSIX style IO functions.
  */
 
-#include <string>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <fstream>
-#include "stdtypes.h"
-
 typedef FILE	LLFILE;
 
 #ifdef LL_WINDOWS
@@ -36,6 +30,7 @@ typedef FILE	LLFILE;
 // windows version of stat function and stat data structure are called _stat
 typedef struct _stat	llstat;
 #else
+#include <sys/stat.h>
 typedef struct stat		llstat;
 #endif
 

indra/llcommon/llformat.cpp

@@ -11,7 +11,7 @@
 
 #include "llformat.h"
 
-#include <stdarg.h>
+#include <cstdarg>
 
 std::string llformat(const char *fmt, ...)
 {

indra/llcommon/llformat.h

@@ -10,8 +10,6 @@
 #ifndef LL_LLFORMAT_H
 #define LL_LLFORMAT_H
 
-#include <string>
-
 // Use as follows:
 // llinfos << llformat("Test:%d (%.2f %.2f)", idx, x, y) << llendl;
 //

indra/llcommon/llmap.h

@@ -9,10 +9,6 @@
 #ifndef LL_LLMAP_H
 #define LL_LLMAP_H
 
-#include <stdio.h>
-#include <utility>
-#include <map>
-
 // llmap uses the fast stl library code in a manner consistant with LLSkipMap, et. al. 
 
 template<class INDEX_TYPE, class MAPPED_TYPE> class LLMap

indra/llcommon/llprocessor.cpp

@@ -28,9 +28,7 @@
 
 #include "processor.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <memory.h>
+#include <memory>
 
 #if LL_WINDOWS
 #	define WIN32_LEAN_AND_MEAN

indra/llcommon/llsd.cpp

@@ -9,9 +9,6 @@
 #include "linden_common.h"
 #include "llsd.h"
 
-#include <sstream>
-#include <math.h>
-
 #include "llerror.h"
 #include "../llmath/llmath.h"
 #include "llformat.h"

indra/llcommon/llstl.h

@@ -10,15 +10,9 @@
 #define LL_LLSTL_H
 
 #include <functional>
-#include <algorithm>
-#include <map>
-#include <vector>
 #include <set>
 #include <deque>
 
-#include <stdio.h>
-#include <stdarg.h>
-
 // Use to compare the first element only of a pair
 // e.g. typedef std::set<std::pair<int, Data*>, compare_pair<int, Data*> > some_pair_set_t; 
 template <typename T1, typename T2>