Merge

Sun, 01 Dec 2013 22:35:15 -0500

author
vladidan
date
Sun, 01 Dec 2013 22:35:15 -0500
changeset 6141
3fbb71fdc6e5
parent 6139
b6b9a5d4cda0
parent 6140
77b028ba548c
child 6143
6ce6a0d23467
child 6149
9fc985481d78

Merge

     1.1 --- a/src/share/vm/prims/jvmtiImpl.hpp	Fri Nov 29 11:20:34 2013 -0800
     1.2 +++ b/src/share/vm/prims/jvmtiImpl.hpp	Sun Dec 01 22:35:15 2013 -0500
     1.3 @@ -299,7 +299,7 @@
     1.4    static inline bool is_breakpoint(address bcp);
     1.5  
     1.6    static void oops_do(OopClosure* f);
     1.7 -  static void metadata_do(void f(Metadata*));
     1.8 +  static void metadata_do(void f(Metadata*)) NOT_JVMTI_RETURN;
     1.9    static void gc_epilogue();
    1.10  };
    1.11  

mercurial