IceUtil/stacktrace v140 fixes

2 files changed, 18 insertions, 10 deletions

diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp
index 81f8bdf4ee2..c67eff6f388 100644
--- a/cpp/test/IceUtil/stacktrace/Client.cpp
+++ b/cpp/test/IceUtil/stacktrace/Client.cpp
@@ -84,7 +84,7 @@ getIceHome()
     string iceHome = (ret > 0 && ret < buf.size()) ? IceUtil::wstringToString(&buf[0]) : string("");
     if(!iceHome.empty())
     {
-	return iceHome;
+        return iceHome;
     }
     else
     {
@@ -129,8 +129,9 @@ splitLines(const string& str)
     vector<string> result;
     istringstream is(str);
     string line;
-    while(std::getline(is, line)) {
-	result.push_back(line);
+    while(std::getline(is, line))
+    {
+        result.push_back(line);
     };
     return result;
 }
@@ -198,8 +199,12 @@ int main(int argc, char* argv[])
 #endif
     {
         filename += "release";
-#if defined(_MSC_VER) && (_MSC_VER == 1800)
+#if defined(_MSC_VER)
+#   if(_MSC_VER == 1800)
         filename += "-vc120";
+#   elif(_MSC_VER == 1900)
+	filename += "-vc140";
+#   endif
 #endif
     }
     else
@@ -244,12 +249,12 @@ int main(int argc, char* argv[])
             test(stack == expected);
         }
 #else
-        vector<string> actual = splitLines(stack);
-	    test(expected.size() <= actual.size());
-	    for(size_t i = 0; i < expected.size(); ++i)
-	    {
-            test(actual[i].find(expected[i]) != string::npos);
-	    }
+    vector<string> actual = splitLines(stack);
+    test(expected.size() <= actual.size());
+    for(size_t i = 0; i < expected.size(); ++i)
+    {
+        test(actual[i].find(expected[i]) != string::npos);
+    }
 #endif
     }
     cout << "ok" << endl;
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win32 b/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win32
new file mode 100644
index 00000000000..e3d09003035
--- /dev/null
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win32
@@ -0,0 +1,3 @@
+0 IceUtil::NullHandleException::NullHandleException
+1 `anonymous namespace'::Thrower::first
+2 main