Merge topic 'fix-vtkNumberToString'

74437a9b disable TestNumberToString on MSVC 2013.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ken Martin <ken.martin@kitware.com>
Merge-request: !4321

IO/Core/Testing/Cxx/CMakeLists.txt

+set(extra_tests)
+if ((NOT DEFINED MSVC_VERSION) OR (MSVC_VERSION GREATER 1800))
+  # skip this test on MSVC 2013 or older.
+  set(extra_tests
+    TestNumberToString.cxx)
+endif()
+
 vtk_add_test_cxx(vtkIOCoreCxxTests tests
   NO_VALID
   TestArrayDataWriter.cxx
@@ -6,6 +13,6 @@ vtk_add_test_cxx(vtkIOCoreCxxTests tests
   TestCompressLZ4.cxx
   TestCompressZLib.cxx
   TestCompressLZMA.cxx
-  TestNumberToString.cxx
+  ${extra_tests}
   )
 vtk_test_cxx_executable(vtkIOCoreCxxTests tests)

IO/Core/Testing/Cxx/TestNumberToString.cxx

@@ -174,12 +174,8 @@ int ConvertNumericLimitsValue(const char* t, T)
     convertedStream >> convertedValue;
     if (value != convertedValue)
     {
-#if (!defined(_MSC_VER)) || (_MSC_VER > 1800)
       std::cout << "ERROR: Bad conversion of std::min" << std::endl;
       status = EXIT_FAILURE;
-#else
-      std::cout << "WARNING: Bad conversion of std::min (ignored on MSVC 2013 and older)" << std::endl;
-#endif
     }
   }
   {