- load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010)

source/shared_lib/include/util/checksum.h

@@ -14,7 +14,7 @@
 
 #include <string>
 #include <map>
-#include "types.h"
+#include "data_types.h"
 #include "thread.h"
 #include "leak_dumper.h"
 

source/shared_lib/include/util/conversion.h

@@ -13,7 +13,7 @@
 #define _SHARED_UTIL_CONVERSION_H_
 
 #include <string>
-#include "types.h"
+#include "data_types.h"
 #include "leak_dumper.h"
 
 using std::string;

source/shared_lib/include/util/leak_dumper.h

@@ -21,6 +21,7 @@
 // START - Special includes because the use a special new operator that we cannot override
 #include <string>
 #include "rapidxml.hpp"
+
 #include <xercesc/dom/DOM.hpp>
 // END - Special includes because the use a special new operator that we cannot override
 

source/shared_lib/include/util/string_utils.h

@@ -23,7 +23,7 @@
 # include <vector>
 # include <cstdarg>
 # include <string>
-#include "types.h"
+#include "data_types.h"
 
 #ifdef __MINGW32__
 typedef unsigned char byte;