--- old/src/hotspot/share/runtime/orderAccess.hpp	2018-03-07 23:13:38.117409221 -0500
+++ new/src/hotspot/share/runtime/orderAccess.hpp	2018-03-07 23:13:37.166758047 -0500
@@ -296,7 +296,7 @@
 // generalized variant is used.
 
 template<size_t byte_size, ScopedFenceType type>
-struct OrderAccess::PlatformOrderedStore VALUE_OBJ_CLASS_SPEC {
+struct OrderAccess::PlatformOrderedStore {
   template <typename T>
   void operator()(T v, volatile T* p) const {
     ordered_store<T, type>(p, v);
@@ -304,7 +304,7 @@
 };
 
 template<size_t byte_size, ScopedFenceType type>
-struct OrderAccess::PlatformOrderedLoad VALUE_OBJ_CLASS_SPEC {
+struct OrderAccess::PlatformOrderedLoad {
   template <typename T>
   T operator()(const volatile T* p) const {
     return ordered_load<T, type>(p);