diff src/share/vm/runtime/globals.cpp @ 1162:d749b1813f40

Merge
author trims
date Fri, 15 Jan 2010 14:25:44 -0800
parents f62a22282a47
children c18cbe5936b8
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.cpp	Thu Jan 14 15:48:26 2010 -0800
+++ b/src/share/vm/runtime/globals.cpp	Fri Jan 15 14:25:44 2010 -0800
@@ -468,6 +468,8 @@
   assert(Arguments::check_vm_args_consistency(), "Some flag settings conflict");
 }
 
+#endif // PRODUCT
+
 void CommandLineFlags::printFlags() {
   // Print the flags sorted by name
   // note: this method is called before the thread structure is in place
@@ -493,5 +495,3 @@
   }
   FREE_C_HEAP_ARRAY(Flag*, array);
 }
-
-#endif