common/mds/osd: Explicitly delete if no copy, and remove incorrect comment

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>

diff --git a/src/include/elist.h b/src/include/elist.h
index 1bf3df8c6c8758f526b7ee847b0d62316ace69de..6719b9c92d84053196b77780f8895ff5d0075fb4 100644 (file)
--- a/src/include/elist.h
+++ b/src/include/elist.h
@@ -39,9 +39,8 @@ public:
       assert(!is_on_list());
     }
 
-    // no copying!
-    item(const item& other);
-    const item& operator= (const item& right);
+    item(const item& other) = delete;
+    const item& operator= (const item& right) = delete;
 
     
     bool empty() const { return _prev == this; }

diff --git a/src/include/xlist.h b/src/include/xlist.h
index 3e39333e511d4245d785c5ce7cf5d34531829486..5e4995af8300bdbd7068d5fa404b4eeef6a11720 100644 (file)
--- a/src/include/xlist.h
+++ b/src/include/xlist.h
@@ -33,9 +33,8 @@ public:
       //remove_myself();
     }
 
-    // no copying!
-    item(const item& other);
-    const item& operator= (const item& right);
+    item(const item& other) = delete;
+    const item& operator= (const item& right) = delete;
 
     
     xlist* get_list() { return _list; }

diff --git a/src/mds/Capability.h b/src/mds/Capability.h
index e3ada8411c43e798ad9f09745ed0a8f805ce8b14..3543efee849fbc752070e49c62b7082752e87688 100644 (file)
--- a/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@ -127,9 +127,9 @@ public:
     mseq(0),
     suppress(0), state(0) {
   }
-  Capability(const Capability& other);  // no copying
+  Capability(const Capability& other) = delete;
 
-  const Capability& operator=(const Capability& other);  // no copying
+  const Capability& operator=(const Capability& other) = delete;
 
   int pending() { return _pending; }
   int issued() { return _issued; }

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index d817a632a017ba5bddf3cc0c4c6a51a7a766b82f..fd1f381d90cf8570c2a49c121833fad2ae9b3046 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -587,7 +587,6 @@ private:
     memset(&fsid, 0, sizeof(fsid));
   }
 
-  // no copying
 private:
   OSDMap(const OSDMap& other) = default;
   OSDMap& operator=(const OSDMap& other) = default;

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index de225dc865b4d1ae2149eb40311eec755de16801..701e642ecc8c01dec69ab3a4b3abce5e4b293774 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1754,9 +1754,8 @@ public:
                 ping_tid(0),
                 map_dne_bound(0) {}
 
-    // no copy!
-    const LingerOp &operator=(const LingerOp& r);
-    LingerOp(const LingerOp& o);
+    const LingerOp &operator=(const LingerOp& r) = delete;
+    LingerOp(const LingerOp& o) = delete;
 
     uint64_t get_cookie() {
       return reinterpret_cast<uint64_t>(this);