Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorkmo
Thu, 14 Mar 2013 16:17:58 -0700
changeset 16359 43372abd0c17
parent 15947 eadc31b7dd02 (current diff)
parent 16358 ebf30634b326 (diff)
child 16360 412be73af451
child 16365 011271eb4373
Merge
--- a/hotspot/src/share/vm/runtime/vm_version.cpp	Thu Mar 14 07:44:18 2013 -0700
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp	Thu Mar 14 16:17:58 2013 -0700
@@ -211,6 +211,10 @@
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0 (VS2005)"
       #elif _MSC_VER == 1500
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 9.0 (VS2008)"
+      #elif _MSC_VER == 1600
+        #define HOTSPOT_BUILD_COMPILER "MS VC++ 10.0 (VS2010)"
+      #elif _MSC_VER == 1700
+        #define HOTSPOT_BUILD_COMPILER "MS VC++ 11.0 (VS2012)"
       #else
         #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
       #endif
jdk-sandbox