import 15.2.5

[ceph.git] / ceph / src / log / Log.h

diff --git a/ceph/src/log/Log.h b/ceph/src/log/Log.h
index a0b12e274323172cc4b7eeacb8ade39df05f4d0e..2947a63f133fe58f1fd40d6f96720f31b070590c 100644 (file)
--- a/ceph/src/log/Log.h
+++ b/ceph/src/log/Log.h
@@ -33,7 +33,6 @@ class Log : private Thread
   static const std::size_t DEFAULT_MAX_RECENT = 10000;
 
   Log **m_indirect_this;
-  log_clock clock;
 
   const SubsystemMap *m_subs;
 
@@ -77,7 +76,7 @@ class Log : private Thread
 
   void _log_safe_write(std::string_view sv);
   void _flush_logbuf();
-  void _flush(EntryVector& q, bool requeue, bool crash);
+  void _flush(EntryVector& q, bool crash);
 
   void _log_message(const char *s, bool crash);