diff src/share/vm/oops/method.cpp @ 10409:36bcc10e01c0

merge fixes
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 15:37:32 +0200
parents 836a62f43af9
children 6b0fd0964b87
line wrap: on
line diff
--- a/src/share/vm/oops/method.cpp	Wed Jun 19 10:45:56 2013 +0200
+++ b/src/share/vm/oops/method.cpp	Wed Jun 19 15:37:32 2013 +0200
@@ -1988,5 +1988,3 @@
   guarantee(md == NULL ||
       md->is_methodData(), "should be method data");
 }
-
-#endif