--- a/hotspot/src/share/vm/oops/klassVtable.cpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp	Thu Jan 14 13:26:19 2016 +0100
@@ -59,7 +59,7 @@
     Array<Method*>* methods, AccessFlags class_flags,
     Handle classloader, Symbol* classname, Array<Klass*>* local_interfaces,
     TRAPS) {
-  No_Safepoint_Verifier nsv;
+  NoSafepointVerifier nsv;
 
   // set up default result values
   int vtable_length = 0;