From c4b430dcc78b9baa80a823b61ed7059dd3bb96bb Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Tue, 22 Apr 2008 18:11:00 -0400
Subject: StringConverter plugin windows port + various windows build fixes

---
 cpp/src/IceUtil/Thread.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'cpp/src/IceUtil/Thread.cpp')

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();
-- 
cgit v1.2.3