changeset 5706:3fbb71fdc6e5

Merge
author vladidan
date Sun, 01 Dec 2013 22:35:15 -0500
parents b6b9a5d4cda0 77b028ba548c
children 6ce6a0d23467 9fc985481d78
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiImpl.hpp	Fri Nov 29 11:20:34 2013 -0800
+++ b/src/share/vm/prims/jvmtiImpl.hpp	Sun Dec 01 22:35:15 2013 -0500
@@ -299,7 +299,7 @@
   static inline bool is_breakpoint(address bcp);
 
   static void oops_do(OopClosure* f);
-  static void metadata_do(void f(Metadata*));
+  static void metadata_do(void f(Metadata*)) NOT_JVMTI_RETURN;
   static void gc_epilogue();
 };