changeset 3327:f49c31acee88

Merge
author dholmes
date Wed, 04 May 2011 23:10:58 -0400
parents 6c978a541c03 (diff) 6dce0126f44e (current diff)
children 52df0980eb50
files make/linux/makefiles/cscope.make make/solaris/makefiles/cscope.make
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Wed May 04 11:04:45 2011 -0400
+++ b/src/share/vm/runtime/arguments.cpp	Wed May 04 23:10:58 2011 -0400
@@ -960,7 +960,7 @@
   // Ensure Agent_OnLoad has the correct initial values.
   // This may not be the final mode; mode may change later in onload phase.
   PropertyList_unique_add(&_system_properties, "java.vm.info",
-                          (char*)Abstract_VM_Version::vm_info_string(), false);
+                          (char*)VM_Version::vm_info_string(), false);
 
   UseInterpreter             = true;
   UseCompiler                = true;