Replaced VC1xx by v1xx for consistency

10 files changed, 20 insertions, 20 deletions

diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index 24551646985..533cb56dbba 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -83,7 +83,7 @@ public:
     void exception(const std::string&, bool);
 #if defined(_MSC_VER) && (_MSC_VER == 1500)
     //
-    // COMPILERFIX VC90 get confused with overloads above
+    // COMPILERFIX v90 get confused with overloads above
     // when passing a const char* as first argument.
     //
     void exception(const char* msg, bool amd)
@@ -107,7 +107,7 @@ protected:
 
 #if defined(_MSC_VER) && (_MSC_VER == 1500)
     //
-    // COMPILERFIX VC90 get confused with overloads above
+    // COMPILERFIX v90 get confused with overloads above
     // when passing a const char* as first argument.
     //
     void handleException(const char* msg, bool amd)
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index cea157c6863..a1d97e16df1 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -41,7 +41,7 @@ ICE_API extern const Context noExplicitContext;
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
 //
-// COMPILERFIX VC90 and VC100 get confused with namespaces and complains that
+// COMPILERFIX v90 and v100 get confused with namespaces and complains that
 // ::Ice::noExplicitContext isn't defined in IceProxy namespace.
 //
 namespace IceProxy
diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h
index 5e65a39a8af..5e9d9291143 100644
--- a/cpp/include/IceUtil/ScannerConfig.h
+++ b/cpp/include/IceUtil/ScannerConfig.h
@@ -13,7 +13,7 @@
 #include <IceUtil/Config.h> // Required by generated Scanners.
 
 //
-// COMPILERFIX: VC compilers does not provide stdint.h header until VC100
+// COMPILERFIX: VC compilers does not provide stdint.h header until v100
 // the header must be included before that macros for integral types
 // in flex generated Scanners are defined.
 //
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 4d99ae515d8..e9ddd8b1f5e 100755
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -917,7 +917,7 @@ IceInternal::NativeInfo::queueAction(SocketOperation op, IAsyncAction^ action, b
             [=] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
             {
                 //
-                // COMPILERFIX with VC141 using operator!= and operator== inside
+                // COMPILERFIX with v141 using operator!= and operator== inside
                 // a lambda callback triggers a compiler bug, we move the code to
                 // a seperate private method to workaround the issue.
                 //
@@ -969,7 +969,7 @@ IceInternal::NativeInfo::queueOperation(SocketOperation op, IAsyncOperation<unsi
                 [=] (IAsyncOperation<unsigned int>^ operation, Windows::Foundation::AsyncStatus status)
                 {
                     //
-                    // COMPILERFIX with VC141 using operator!= and operator== inside
+                    // COMPILERFIX with v141 using operator!= and operator== inside
                     // a lambda callback triggers a compiler bug, we move the code to
                     // a seperate private method to workaround the issue.
                     //
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index f3e35523fdf..50fa5868e5d 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -907,7 +907,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
     //
-    // COMPILERFIX VC90 and VC100 get confused with namespaces and we need to
+    // COMPILERFIX v90 and v100 get confused with namespaces and we need to
     // defined both Ice::noExplicitContext and IceProxy::Ice::noExplicitContext
     // see comments in Ice/Proxy.h.
     //
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 128e02727ce..5d887a44446 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -38,7 +38,7 @@ const Context noExplicitContext;
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
 //
-// COMPILERFIX VC90 and VC100 get confused with namespaces and complains that
+// COMPILERFIX v90 and v100 get confused with namespaces and complains that
 // ::Ice::noExplicitContext isn't defined in IceProxy namespace.
 //
 namespace IceProxy
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index a48c8b017e4..49f60a06f80 100755
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -377,7 +377,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                         [this] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
                         {
                             //
-                            // COMPILERFIX with VC141 using operator!= and operator== inside
+                            // COMPILERFIX with v141 using operator!= and operator== inside
                             // a lambda callback triggers a compiler bug, we move the code to
                             // a seperate private method to workaround the issue.
                             //
@@ -399,7 +399,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                         [=](IAsyncOperation<IOutputStream^>^ info, Windows::Foundation::AsyncStatus status)
                         {
                             //
-                            // COMPILERFIX with VC141 using operator!= and operator== inside
+                            // COMPILERFIX with v141 using operator!= and operator== inside
                             // a lambda callback triggers a compiler bug, we move the code to
                             // a seperate private method to workaround the issue.
                             //
@@ -432,7 +432,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                 [=, &buf](concurrency::task<IOutputStream^> task)
                 {
                     //
-                    // COMPILERFIX with VC141 using operator!= and operator== inside
+                    // COMPILERFIX with v141 using operator!= and operator== inside
                     // a lambda callback triggers a compiler bug, we move the code to
                     // a seperate private method to workaround the issue.
                     //
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp
index b6b4bdff760..23dc64e8f7b 100644
--- a/cpp/src/IceSSL/SChannelEngine.cpp
+++ b/cpp/src/IceSSL/SChannelEngine.cpp
@@ -33,7 +33,7 @@
 const int ICESSL_CALG_ECDH_EPHEM = 0x0000AE06;
 
 //
-// COMPILERFIX SCH_USE_STRONG_CRYPTO not defined with VC90
+// COMPILERFIX SCH_USE_STRONG_CRYPTO not defined with v90
 //
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
 #  ifndef SCH_USE_STRONG_CRYPTO
diff --git a/scripts/Component.py b/scripts/Component.py
index 9e8f6cfe030..258211e4572 100644
--- a/scripts/Component.py
+++ b/scripts/Component.py
@@ -83,7 +83,7 @@ class Ice(Component):
                      "Ice/properties",          # Property files are not supported with UWP
                      "Ice/plugin",
                      "Ice/threadPoolPriority"])
-        elif isinstance(platform, Windows) and platform.getCompiler() in ["VC100"]:
+        elif isinstance(platform, Windows) and platform.getCompiler() in ["v100"]:
             return (["Ice/.*", "IceSSL/.*", "IceBox/.*", "IceDiscovery/.*", "IceUtil/.*", "Slice/.*"], [])
         elif isinstance(mapping, CSharpMapping) and config.xamarin:
             return (["Ice/.*"],
@@ -245,9 +245,9 @@ for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir(t
 if isinstance(platform, Windows):
     # Windows doesn't support all the mappings, we take them out here.
     Mapping.remove("ruby")
-    if platform.getCompiler() != "VC140":
+    if platform.getCompiler() != "v140":
         Mapping.remove("python")
-    if platform.getCompiler() not in ["VC140", "VC141"]:
+    if platform.getCompiler() not in ["v140", "v141"]:
         Mapping.remove("php")
 elif not platform.hasDotNet():
     # Remove C# if Dot Net Core isn't supported
diff --git a/scripts/Util.py b/scripts/Util.py
index ec5c5d727bd..bfac1a25e65 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -388,15 +388,15 @@ class Windows(Platform):
             try:
                 out = run("cl")
                 if out.find("Version 16.") != -1:
-                    self.compiler = "VC100"
+                    self.compiler = "v100"
                 elif out.find("Version 17.") != -1:
-                    self.compiler = "VC110"
+                    self.compiler = "v110"
                 elif out.find("Version 18.") != -1:
-                    self.compiler = "VC120"
+                    self.compiler = "v120"
                 elif out.find("Version 19.00.") != -1:
-                    self.compiler = "VC140"
+                    self.compiler = "v140"
                 elif out.find("Version 19.1") != -1:
-                    self.compiler = "VC141"
+                    self.compiler = "v141"
                 else:
                     raise RuntimeError("Unknown compiler version:\n{0}".format(out))
             except: