Use make_shared<>.

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

diff --git a/src/lib/log.cc b/src/lib/log.cc
index d4f469602065bc3f3776f26a87a1538c440b01aa..769852044348cebbbafc37ba66c02656928bb513 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -26,6 +27,7 @@
 #include "config.h"
 #include "safe_stringstream.h"
 #include "string_log_entry.h"
+#include <boost/make_shared.hpp>
 #include <time.h>
 #include <cstdio>
 
@@ -34,6 +36,7 @@
 using std::string;
 using std::cout;
 using boost::shared_ptr;
+using boost::make_shared;
 
 Log::Log ()
        : _types (0)
@@ -70,11 +73,7 @@ Log::log (string message, int type)
                return;
        }
 
-       shared_ptr<StringLogEntry> e (new StringLogEntry (type, message));
-
-#ifdef DCPOMATIC_DEBUG
-       cout << e->get() << "\n";
-#endif
+       shared_ptr<StringLogEntry> e = boost::make_shared<StringLogEntry> (type, message);
 
        do_log (e);
 }
@@ -84,13 +83,13 @@ Log::dcp_log (dcp::NoteType type, string m)
 {
        switch (type) {
        case dcp::DCP_PROGRESS:
-               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_GENERAL, m)));
+               do_log (boost::make_shared<const StringLogEntry> (LogEntry::TYPE_GENERAL, m));
                break;
        case dcp::DCP_ERROR:
-               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_ERROR, m)));
+               do_log (boost::make_shared<const StringLogEntry> (LogEntry::TYPE_ERROR, m));
                break;
        case dcp::DCP_NOTE:
-               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_WARNING, m)));
+               do_log (boost::make_shared<const StringLogEntry> (LogEntry::TYPE_WARNING, m));
                break;
        }
 }