Merge

Thu, 14 Mar 2013 16:17:58 -0700

author
kmo
date
Thu, 14 Mar 2013 16:17:58 -0700
changeset 4758
a40807924950
parent 4731
71f13276159d
parent 4757
9960dce2024f
child 4759
f3d486462d36
child 4764
8552f0992748

Merge

     1.1 --- a/src/share/vm/runtime/vm_version.cpp	Thu Mar 14 07:44:18 2013 -0700
     1.2 +++ b/src/share/vm/runtime/vm_version.cpp	Thu Mar 14 16:17:58 2013 -0700
     1.3 @@ -211,6 +211,10 @@
     1.4          #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0 (VS2005)"
     1.5        #elif _MSC_VER == 1500
     1.6          #define HOTSPOT_BUILD_COMPILER "MS VC++ 9.0 (VS2008)"
     1.7 +      #elif _MSC_VER == 1600
     1.8 +        #define HOTSPOT_BUILD_COMPILER "MS VC++ 10.0 (VS2010)"
     1.9 +      #elif _MSC_VER == 1700
    1.10 +        #define HOTSPOT_BUILD_COMPILER "MS VC++ 11.0 (VS2012)"
    1.11        #else
    1.12          #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
    1.13        #endif

mercurial