From: Adam C. Emerson <aemerson@redhat.com>
Date: Tue, 15 Sep 2020 17:58:30 +0000 (-0400)
Subject: common/ceph_time: Don't define public things in time_detail
X-Git-Tag: v15.2.17~64^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=148a6d99d80f0576150d56a02045a8f242016724;p=ceph.git

common/ceph_time: Don't define public things in time_detail

Defining things in a detail section and then using them outside turned
out to not be the best idea.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 01f706ca0ffd39680dbfacf348750c9c0f851578)

Conflicts:
	src/rgw/rgw_sync_error_repo.h not present in octopus
---

diff --git a/src/common/iso_8601.cc b/src/common/iso_8601.cc
index 29cfd4b4737f4..ac18b713907de 100644
--- a/src/common/iso_8601.cc
+++ b/src/common/iso_8601.cc
@@ -6,6 +6,7 @@
 
 #include "iso_8601.h"
 #include "include/timegm.h"
+#include "include/ceph_assert.h"
 
 namespace ceph {
 using std::chrono::duration_cast;
diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h
index 530c803ce48f7..035aae852a8a7 100644
--- a/src/messages/MOSDPing.h
+++ b/src/messages/MOSDPing.h
@@ -64,7 +64,7 @@ private:
   utime_t ping_stamp;               ///< when the PING was sent
   ceph::signedspan mono_ping_stamp; ///< relative to sender's clock
   ceph::signedspan mono_send_stamp; ///< replier's send stamp
-  std::optional<ceph::time_detail::signedspan> delta_ub;  ///< ping sender
+  std::optional<ceph::signedspan> delta_ub;  ///< ping sender
   epoch_t up_from = 0;
 
   uint32_t min_message_size = 0;
@@ -75,7 +75,7 @@ private:
 	   ceph::signedspan mss,
 	   epoch_t upf,
 	   uint32_t min_message,
-	   std::optional<ceph::time_detail::signedspan> delta_ub = {})
+	   std::optional<ceph::signedspan> delta_ub = {})
     : Message{MSG_OSD_PING, HEAD_VERSION, COMPAT_VERSION},
       fsid(f), map_epoch(e), op(o),
       ping_stamp(s),