--- old/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp	2019-12-01 18:04:54.050144810 -0500
+++ new/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp	2019-12-01 18:04:53.786130664 -0500
@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahLock.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
+#include "utilities/macros.hpp"
 
 class ShenandoahHeap;
 class ShenandoahHeapRegion;
@@ -52,10 +53,8 @@
   ShenandoahParallelCodeHeapIterator* _iters;
   int                       _length;
 
-private:
-  // Noncopyable.
-  ShenandoahParallelCodeCacheIterator(const ShenandoahParallelCodeCacheIterator& o);
-  ShenandoahParallelCodeCacheIterator& operator=(const ShenandoahParallelCodeCacheIterator& o);
+  NONCOPYABLE(ShenandoahParallelCodeCacheIterator);
+
 public:
   ShenandoahParallelCodeCacheIterator(const GrowableArray<CodeHeap*>* heaps);
   ~ShenandoahParallelCodeCacheIterator();