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 29cfd4b4737f4d0b892837084f48e34f3a157697..ac18b713907de577e4c47212c0edd972a9e47571 100644 (file)
--- 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 530c803ce48f7b2740b3bff383a6db6551ac9ffc..035aae852a8a7fd6e46869f57816e48a81ebbef3 100644 (file)
--- 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),