--- old/src/hotspot/share/utilities/waitBarrier.hpp	2019-12-01 18:05:09.426968720 -0500
+++ new/src/hotspot/share/utilities/waitBarrier.hpp	2019-12-01 18:05:09.178955431 -0500
@@ -28,6 +28,7 @@
 #include "memory/allocation.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/waitBarrier_generic.hpp"
 
 #if defined(LINUX)
@@ -81,9 +82,7 @@
 class WaitBarrierType : public CHeapObj<mtInternal> {
   WaitBarrierImpl _impl;
 
-  // Prevent copying and assignment of WaitBarrier instances.
-  WaitBarrierType(const WaitBarrierDefault&);
-  WaitBarrierType& operator=(const WaitBarrierDefault&);
+  NONCOPYABLE(WaitBarrierType);
 
 #ifdef ASSERT
   int _last_arm_tag;