std::shared_ptr

[dcpomatic.git] / src / lib / log.h

diff --git a/src/lib/log.h b/src/lib/log.h
index 416f4259d248399ed88cbff3f7d682ba2e3c0bf9..c71f8ab16cff700b6cce7265a91de27ff7ab9afd 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -41,7 +41,7 @@ public:
        Log ();
        virtual ~Log () {}
 
-       void log (boost::shared_ptr<const LogEntry> entry);
+       void log (std::shared_ptr<const LogEntry> entry);
        void log (std::string message, int type);
        void dcp_log (dcp::NoteType type, std::string message);
 
@@ -53,7 +53,10 @@ public:
        /** @param amount Approximate number of bytes to return; the returned value
         *  may be shorter or longer than this.
         */
-       virtual std::string head_and_tail (int amount = 1024) const = 0;
+       virtual std::string head_and_tail (int amount = 1024) const {
+               (void) amount;
+               return "";
+       }
 
 protected:
 
@@ -61,7 +64,7 @@ protected:
        mutable boost::mutex _mutex;
 
 private:
-       virtual void do_log (boost::shared_ptr<const LogEntry> entry) = 0;
+       virtual void do_log (std::shared_ptr<const LogEntry> entry) = 0;
 
        /** bit-field of log types which should be put into the log (others are ignored) */
        int _types;