src/hotspot/share/gc/shared/oopStorage.inline.hpp

rev 57095 : [mq]: use
rev 57096 : [mq]: trailing_semi

@@ -32,10 +32,11 @@
 #include "runtime/safepoint.hpp"
 #include "utilities/align.hpp"
 #include "utilities/count_trailing_zeros.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
 
 // Array of all active blocks.  Refcounted for lock-free reclaim of
 // old array when a new array is allocated for expansion.
 class OopStorage::ActiveArray {
   friend class OopStorage::TestAccess;

@@ -46,13 +47,11 @@
   // Block* _blocks[1];            // Pseudo flexible array member.
 
   ActiveArray(size_t size);
   ~ActiveArray();
 
-  // Noncopyable
-  ActiveArray(const ActiveArray&);
-  ActiveArray& operator=(const ActiveArray&);
+  NONCOPYABLE(ActiveArray);
 
   static size_t blocks_offset();
   Block* const* base_ptr() const;
 
   Block* const* block_ptr(size_t index) const;

@@ -116,13 +115,11 @@
   // const, to make const blocks easier to use; a block being const
   // doesn't prevent modifying its list state.
   mutable const Block* _prev;
   mutable const Block* _next;
 
-  // Noncopyable.
-  AllocationListEntry(const AllocationListEntry&);
-  AllocationListEntry& operator=(const AllocationListEntry&);
+  NONCOPYABLE(AllocationListEntry);
 
 public:
   AllocationListEntry();
   ~AllocationListEntry();
 };

@@ -151,13 +148,11 @@
   unsigned get_index(const oop* ptr) const;
 
   template<typename F, typename BlockPtr>
   static bool iterate_impl(F f, BlockPtr b);
 
-  // Noncopyable.
-  Block(const Block&);
-  Block& operator=(const Block&);
+  NONCOPYABLE(Block);
 
 public:
   const AllocationListEntry& allocation_list_entry() const;
 
   static size_t allocation_size();