StringConverter plugin windows port + various windows build fixes

1 files changed, 6 insertions, 1 deletions

diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp
index f9d7290951c..bb9521b72bc 100644
--- a/cpp/src/IceUtil/Thread.cpp
+++ b/cpp/src/IceUtil/Thread.cpp
@@ -20,6 +20,7 @@
 #include <IceUtil/Time.h>
 #include <IceUtil/ThreadException.h>
 #include <climits>
+#include <exception>
 
 using namespace std;
 
@@ -150,7 +151,11 @@ WINAPI startHook(void* arg)
     }
     catch(...)
     {
-        std::terminate();
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+        terminate();
+#else
+	std::terminate();
+#endif
     }
 
     thread->_done();