--- old/src/hotspot/share/gc/shared/ptrQueue.hpp	2019-12-01 18:04:52.082039358 -0500
+++ new/src/hotspot/share/gc/shared/ptrQueue.hpp	2019-12-01 18:04:51.834026069 -0500
@@ -29,6 +29,7 @@
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/lockFreeStack.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/sizes.hpp"
 
 class Mutex;
@@ -44,9 +45,7 @@
 class PtrQueue {
   friend class VMStructs;
 
-  // Noncopyable - not defined.
-  PtrQueue(const PtrQueue&);
-  PtrQueue& operator=(const PtrQueue&);
+  NONCOPYABLE(PtrQueue);
 
   // The ptr queue set to which this queue belongs.
   PtrQueueSet* const _qset;
@@ -205,6 +204,8 @@
   BufferNode() : _index(0), _next(NULL) { }
   ~BufferNode() { }
 
+  NONCOPYABLE(BufferNode);
+
   static size_t buffer_offset() {
     return offset_of(BufferNode, _buffer);
   }
@@ -273,6 +274,8 @@
   void delete_list(BufferNode* list);
   bool try_transfer_pending();
 
+  NONCOPYABLE(Allocator);
+
 public:
   Allocator(const char* name, size_t buffer_size);
   ~Allocator();
@@ -295,9 +298,7 @@
 class PtrQueueSet {
   BufferNode::Allocator* _allocator;
 
-  // Noncopyable - not defined.
-  PtrQueueSet(const PtrQueueSet&);
-  PtrQueueSet& operator=(const PtrQueueSet&);
+  NONCOPYABLE(PtrQueueSet);
 
 protected:
   bool _all_active;