Increase Visual Studio warning level to Level4

Fixes #223.

18 files changed, 67 insertions, 41 deletions

diff --git a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
index 265c0c66ebb..c237942715e 100644
--- a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
@@ -64,7 +64,7 @@ TestControllerI::step(const Glacier2::SessionPrx& currentSession, const TestToke
     {
         case Test::Finished:
         {
-            assert("TestController::step() shouldn't have been called with a state of Finished" == 0);
+            assert(false);
             break;
         }
 
diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp
index 0a16f88dabb..7cb57796d83 100644
--- a/cpp/test/Glacier2/staticFiltering/Client.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Client.cpp
@@ -51,14 +51,14 @@ AttackClient::run(int argc, char** argv)
         }
         catch(const Glacier2::CannotCreateSessionException&)
         {
-            test("Unable to create new session" == 0);
+            test(false);
         }
         BackendPrx backend = BackendPrx::uncheckedCast(communicator->stringToProxy(p->second));
         try
         {
             backend->ice_ping();
             cerr << "Test failed on : " << p->second << endl;
-            test("Expected exception" == 0);
+            test(false);
         }
         catch(const ConnectionLostException&)
         {
@@ -88,7 +88,7 @@ AttackClient::run(int argc, char** argv)
         catch(const LocalException& e)
         {
             cerr << e << endl;
-            test("Unexpected local exception" == 0);
+            test(false);
         }
     }
 
@@ -101,7 +101,7 @@ AttackClient::run(int argc, char** argv)
         }
         catch(const Glacier2::CannotCreateSessionException&)
         {
-            test("Unable to create new session" == 0);
+            test(false);
         }
         BackendPrx backend = BackendPrx::uncheckedCast(communicator->stringToProxy(p->second));
         try
@@ -112,7 +112,7 @@ AttackClient::run(int argc, char** argv)
         {
             cerr << p->second << endl;
             cerr << ex << endl;
-            test("Unexpected local exception" == 0);
+            test(false);
         }
         try
         {
diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp
index ffb0b379dd9..2995812ff1b 100644
--- a/cpp/test/Ice/custom/AllTests.cpp
+++ b/cpp/test/Ice/custom/AllTests.cpp
@@ -871,7 +871,7 @@ allTests(Test::TestHelper* helper)
         int i = 0;
         for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p)
         {
-            *p = '1' + i++;
+            *p = static_cast<Ice::Byte>('1' + i++);
         }
 
         MyByteSeq out;
@@ -1585,7 +1585,7 @@ allTests(Test::TestHelper* helper)
             int i = 0;
             for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p)
             {
-                *p = '1' + i++;
+                *p = static_cast<Ice::Byte>('1' + i++);
             }
 
 #ifdef ICE_CPP11_MAPPING
@@ -2535,7 +2535,7 @@ allTests(Test::TestHelper* helper)
         int i = 0;
         for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p)
         {
-            *p = '1' + i++;
+            *p = static_cast<Ice::Byte>('1' + i++);
         }
 
 #ifdef ICE_CPP11_MAPPING
diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp
index 5ecf58786d7..d88b94ab20f 100644
--- a/cpp/test/Ice/custom/StringConverterI.cpp
+++ b/cpp/test/Ice/custom/StringConverterI.cpp
@@ -21,7 +21,7 @@ Test::StringConverterI::toUTF8(const char* sourceStart, const char* sourceEnd, U
 
     for(size_t i = 0; i < size; ++i)
     {
-        targetStart[i] = tolower(sourceStart[i]);
+        targetStart[i] = static_cast<Byte>(tolower(sourceStart[i]));
     }
 
     return targetEnd;
@@ -35,7 +35,7 @@ Test::StringConverterI::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd,
     target.resize(size);
     for(size_t i = 0; i < size; ++i)
     {
-        target[i] = toupper(sourceStart[i]);
+        target[i] = static_cast<Byte>(toupper(sourceStart[i]));
     }
 }
 
@@ -51,7 +51,7 @@ Test::WstringConverterI::toUTF8(const wchar_t* sourceStart, const wchar_t* sourc
 
     for(size_t i = 0; i < size; ++i)
     {
-        targetStart[i] = tolower(s[i]);
+        targetStart[i] = static_cast<Byte>(tolower(s[i]));
     }
     return targetEnd;
 }
@@ -63,7 +63,7 @@ Test::WstringConverterI::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd
     string s(sourceStart, sourceEnd);
     for(size_t i = 0; i < s.size(); ++i)
     {
-        s[i] = toupper(s[i]);
+        s[i] = static_cast<char>(toupper(s[i]));
     }
     target = stringToWstring(s);
 }
diff --git a/cpp/test/Ice/enums/AllTests.cpp b/cpp/test/Ice/enums/AllTests.cpp
index d843cff6d80..aa16ee2d3b2 100644
--- a/cpp/test/Ice/enums/AllTests.cpp
+++ b/cpp/test/Ice/enums/AllTests.cpp
@@ -87,14 +87,14 @@ allTests(Test::TestHelper* helper)
         Ice::OutputStream out(communicator);
         out.write(ICE_ENUM(ShortEnum, senum11));
         out.finished(bytes);
-        test(bytes.size() == (encoding_1_0 ? 2 : 5));
+        test(bytes.size() == (encoding_1_0 ? size_t(2) : size_t(5)));
     }
 
     {
         Ice::OutputStream out(communicator);
         out.write(ICE_ENUM(IntEnum, ienum11));
         out.finished(bytes);
-        test(bytes.size() == (encoding_1_0 ? 4 : 5));
+        test(bytes.size() == (encoding_1_0 ? size_t(4) : size_t(5)));
     }
 
     {
diff --git a/cpp/test/Ice/impl/msbuild/server/server.vcxproj b/cpp/test/Ice/impl/msbuild/server/server.vcxproj
index 90ba403b906..3856f6d82d7 100644
--- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/impl/msbuild/server/server.vcxproj
@@ -126,56 +126,56 @@
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Label="IceBuilder">
diff --git a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj
index 33819fac93e..0a8d2a928b3 100644
--- a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj
@@ -126,56 +126,56 @@
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Label="IceBuilder">
diff --git a/cpp/test/Ice/info/TestI.cpp b/cpp/test/Ice/info/TestI.cpp
index e5e096711a1..6d96c47182d 100644
--- a/cpp/test/Ice/info/TestI.cpp
+++ b/cpp/test/Ice/info/TestI.cpp
@@ -82,7 +82,7 @@ TestI::getEndpointInfoAsContext(const Ice::Current& c)
     {
         Ice::UDPEndpointInfoPtr udp = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, ipinfo);
         ctx["mcastInterface"] = udp->mcastInterface;
-        ctx["mcastTtl"] = udp->mcastTtl;
+        ctx["mcastTtl"] = static_cast<char>(udp->mcastTtl);
     }
 
     return ctx;
diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp
index 7e67d887a47..af94496df1e 100644
--- a/cpp/test/Ice/metrics/AllTests.cpp
+++ b/cpp/test/Ice/metrics/AllTests.cpp
@@ -515,13 +515,13 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv)
     if(!collocated)
     {
         test(invoke->remotes.size() == 2);
-        test(invoke->remotes[0]->total = 2);
-        test(invoke->remotes[1]->total = 3);
+        test(invoke->remotes[0]->total == 2);
+        test(invoke->remotes[1]->total == 3);
     }
     else
     {
         test(invoke->collocated.size() == 1);
-        test(invoke->collocated[0]->total = 5);
+        test(invoke->collocated[0]->total == 5);
     }
 
     view = serverMetrics->getMetricsView("View", timestamp);
diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp
index e31fe591f8d..ace1e13fa7d 100644
--- a/cpp/test/Ice/optional/AllTests.cpp
+++ b/cpp/test/Ice/optional/AllTests.cpp
@@ -7,6 +7,10 @@
 //
 // **********************************************************************
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4244) // '=': conversion from x to y, possible loss of data
+#endif
+
 #include <Ice/Ice.h>
 #include <TestHelper.h>
 #include <Test.h>
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index b1a6e86b336..becb5989448 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -13,6 +13,10 @@
 #include <TestHelper.h>
 #include <Test.h>
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4125) // decimal digit terminates octal escape sequence
+#endif
+
 using namespace std;
 
 Test::MyClassPrxPtr
diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp
index eddc65c0062..05ccb3806ab 100644
--- a/cpp/test/Ice/stream/Client.cpp
+++ b/cpp/test/Ice/stream/Client.cpp
@@ -7,6 +7,10 @@
 //
 // **********************************************************************
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4244) // '=': conversion from 'int' to 'Ice::Short', possible loss of data
+#endif
+
 #include <Ice/Ice.h>
 #include <TestHelper.h>
 #include <Test.h>
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp
index d59d99a389c..9264f6638ab 100644
--- a/cpp/test/Ice/stringConverter/Client.cpp
+++ b/cpp/test/Ice/stringConverter/Client.cpp
@@ -14,6 +14,11 @@
 #include <iostream>
 #include <locale.h>
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4127) // conditional expression is constant
+#   pragma warning(disable:4310) // cast truncates constant value
+#endif
+
 using namespace std;
 
 static bool useLocale = false;
diff --git a/cpp/test/Ice/udp/AllTests.cpp b/cpp/test/Ice/udp/AllTests.cpp
index a1492c0c066..3457d346957 100644
--- a/cpp/test/Ice/udp/AllTests.cpp
+++ b/cpp/test/Ice/udp/AllTests.cpp
@@ -74,7 +74,7 @@ allTests(Test::TestHelper* helper)
     TestIntfPrxPtr obj = ICE_UNCHECKED_CAST(TestIntfPrx, base);
 
     int nRetry = 5;
-    bool ret;
+    bool ret = false;
     while(nRetry-- > 0)
     {
         replyI->reset();
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 6c5cd2c7099..231cba6444c 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -16,6 +16,10 @@
 
 #include <Ice/UniqueRef.h>
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4189) // 'elCapitanUpdate2OrLower': local variable is initialized but not referenced
+#endif
+
 #if defined(__APPLE__)
 #   include <sys/sysctl.h>
 #   if TARGET_OS_IPHONE != 0
@@ -251,7 +255,7 @@ public:
             do
             {
                 if((next = CertFindCertificateInStore(p12, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0,
-                                                      CERT_FIND_ANY, 0, next)))
+                                                      CERT_FIND_ANY, 0, next)) != 0)
                 {
                     if(CertAddCertificateContextToStore(_store, next, CERT_STORE_ADD_ALWAYS, &newCert))
                     {
diff --git a/cpp/test/IceUtil/priority/PriorityInversion.cpp b/cpp/test/IceUtil/priority/PriorityInversion.cpp
index a48b47b3d5f..515a43081e6 100644
--- a/cpp/test/IceUtil/priority/PriorityInversion.cpp
+++ b/cpp/test/IceUtil/priority/PriorityInversion.cpp
@@ -328,11 +328,12 @@ PriorityInversionTest::PriorityInversionTest() :
 void
 PriorityInversionTest::run()
 {
-    int cores, high, medium, low, timeout;
-    timeout = 30;
+
 #ifdef _WIN32
     return; //Priority inversion is not supported by WIN32
 #else
+    int cores, high, medium, low, timeout;
+    timeout = 30;
     try
     {
         IceUtil::Mutex m;
@@ -345,7 +346,6 @@ PriorityInversionTest::run()
     high = 45;
     medium = 35;
     low = 1;
-#endif
 
     {
         Monitor<Mutex> monitor;
@@ -442,4 +442,5 @@ PriorityInversionTest::run()
             }
         }
     }
+#endif
 }
diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp
index 86e1844dbd0..c44e432b07e 100644
--- a/cpp/test/IceUtil/unicode/Client.cpp
+++ b/cpp/test/IceUtil/unicode/Client.cpp
@@ -17,6 +17,10 @@
 #endif
 #include <fstream>
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4127) // conditional expression is constant
+#endif
+
 // Uncomment to include performance testing
 //#define TEST_PERF
 
diff --git a/cpp/test/include/TestHelper.h b/cpp/test/include/TestHelper.h
index 84a9cf72889..f25ef2057f4 100644
--- a/cpp/test/include/TestHelper.h
+++ b/cpp/test/include/TestHelper.h
@@ -124,7 +124,7 @@ private:
         if(ch != EOF)
         {
             assert(pptr() != epptr());
-            sputc(ch);
+            sputc(static_cast<char>(ch));
         }
         return 0;
     }