From cfeadf335cbc84c1625188de60024878dd6bfb10 Mon Sep 17 00:00:00 2001 From: Benau Date: Sat, 17 Feb 2018 10:51:33 +0800 Subject: [PATCH] Move some code to header --- src/network/protocol_manager.cpp | 12 ------------ src/network/protocol_manager.hpp | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/network/protocol_manager.cpp b/src/network/protocol_manager.cpp index ef04e8f11..f1b2c025b 100644 --- a/src/network/protocol_manager.cpp +++ b/src/network/protocol_manager.cpp @@ -60,18 +60,6 @@ std::shared_ptr ProtocolManager::createInstance() return pm; } // createInstance -// ---------------------------------------------------------------------------- -std::shared_ptr ProtocolManager::lock() -{ - return m_protocol_manager.lock(); -} // lock - -// ---------------------------------------------------------------------------- -bool ProtocolManager::emptyInstance() -{ - return m_protocol_manager.expired(); -} // emptyInstance - // ---------------------------------------------------------------------------- ProtocolManager::ProtocolManager() { diff --git a/src/network/protocol_manager.hpp b/src/network/protocol_manager.hpp index 5306ed3b3..ed1834ea5 100644 --- a/src/network/protocol_manager.hpp +++ b/src/network/protocol_manager.hpp @@ -229,8 +229,10 @@ private: virtual void unpauseProtocol(Protocol *protocol); public: - ProtocolManager(); - virtual ~ProtocolManager(); + // =========================================== + // Public constructor is required for shared_ptr + ProtocolManager(); + virtual ~ProtocolManager(); void abort(); void propagateEvent(Event* event); Protocol* getProtocol(ProtocolType type); @@ -250,9 +252,15 @@ public: // ------------------------------------------------------------------------ static std::shared_ptr createInstance(); // ------------------------------------------------------------------------ - static bool emptyInstance(); + static bool emptyInstance() + { + return m_protocol_manager.expired(); + } // emptyInstance // ------------------------------------------------------------------------ - static std::shared_ptr lock(); + static std::shared_ptr lock() + { + return m_protocol_manager.lock(); + } // lock }; // class ProtocolManager