From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 7 Mar 2019 13:29:26 +0000 (+0100)
Subject: msg/async, v2: drop ceph_msg_header2 handling from ControlFrames.
X-Git-Tag: v14.2.0~23^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53160b78cc5eeb61e57e93223e8efc727c48bcf2;p=ceph.git

msg/async, v2: drop ceph_msg_header2 handling from ControlFrames.

This is not needed anymore as MessageFrame class has been split
from the ControlFrame hierarchy - now it directly inherits from
the Frame root.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/msg/async/frames_v2.h b/src/msg/async/frames_v2.h
index e6eb4fb9f699..b2b9d91047ae 100644
--- a/src/msg/async/frames_v2.h
+++ b/src/msg/async/frames_v2.h
@@ -312,8 +312,6 @@ protected:
       for (const auto &elem : t) {
         encode(elem, this->get_payload_segment(), features);
       }
-    } else if constexpr (std::is_same<T, ceph_msg_header2 const>()) {
-      this->get_payload_segment().append((char *)&t, sizeof(t));
     } else {
       encode(t, this->get_payload_segment(), features);
     }
@@ -332,10 +330,6 @@ protected:
       for (uint32_t i = 0; i < size; ++i) {
         decode(t[i], ti);
       }
-    } else if constexpr (std::is_same<T, ceph_msg_header2>()) {
-      auto ptr = ti.get_current_ptr();
-      ti.advance(sizeof(T));
-      t = *(T *)ptr.raw_c_str();
     } else {
       decode(t, ti);
     }