*** old/src/share/vm/prims/whitebox.cpp	Sat Jun 13 09:00:26 2015
--- new/src/share/vm/prims/whitebox.cpp	Sat Jun 13 09:00:26 2015

*** 628,658 ****
--- 628,658 ----
  #endif
    }
  WB_END
  
  template <typename T>
! static bool GetVMFlag(JavaThread* thread, JNIEnv* env, jstring name, T* value, bool (*TAt)(const char*, T*, bool, bool)) {
! static bool GetVMFlag(JavaThread* thread, JNIEnv* env, jstring name, T* value, Flag::Error (*TAt)(const char*, T*, bool, bool)) {
    if (name == NULL) {
      return false;
    }
    ThreadToNativeFromVM ttnfv(thread);   // can't be in VM when we call JNI
    const char* flag_name = env->GetStringUTFChars(name, NULL);
!   bool result = (*TAt)(flag_name, value, true, true);
!   Flag::Error result = (*TAt)(flag_name, value, true, true);
    env->ReleaseStringUTFChars(name, flag_name);
!   return (result == Flag::SUCCESS);
  }
  
  template <typename T>
! static bool SetVMFlag(JavaThread* thread, JNIEnv* env, jstring name, T* value, bool (*TAtPut)(const char*, T*, Flag::Flags)) {
! static bool SetVMFlag(JavaThread* thread, JNIEnv* env, jstring name, T* value, Flag::Error (*TAtPut)(const char*, T*, Flag::Flags)) {
    if (name == NULL) {
      return false;
    }
    ThreadToNativeFromVM ttnfv(thread);   // can't be in VM when we call JNI
    const char* flag_name = env->GetStringUTFChars(name, NULL);
!   bool result = (*TAtPut)(flag_name, value, Flag::INTERNAL);
!   Flag::Error result = (*TAtPut)(flag_name, value, Flag::INTERNAL);
    env->ReleaseStringUTFChars(name, flag_name);
!   return (result == Flag::SUCCESS);
  }
  
  template <typename T>
  static jobject box(JavaThread* thread, JNIEnv* env, Symbol* name, Symbol* sig, T value) {
    ResourceMark rm(thread);