X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=769852044348cebbbafc37ba66c02656928bb513;hp=0f7a59ff84b598f9b997ad0cd7ca9b29019c55b7;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=aeb835a18c8df347e0ed68fb24631b320abeb611 diff --git a/src/lib/log.cc b/src/lib/log.cc index 0f7a59ff8..769852044 100644 --- a/src/lib/log.cc +++ b/src/lib/log.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 Carl Hetherington - 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 . */ @@ -26,13 +27,16 @@ #include "config.h" #include "safe_stringstream.h" #include "string_log_entry.h" +#include #include #include #include "i18n.h" using std::string; +using std::cout; using boost::shared_ptr; +using boost::make_shared; Log::Log () : _types (0) @@ -69,7 +73,9 @@ Log::log (string message, int type) return; } - do_log (shared_ptr (new StringLogEntry (type, message))); + shared_ptr e = boost::make_shared (type, message); + + do_log (e); } void @@ -77,13 +83,13 @@ Log::dcp_log (dcp::NoteType type, string m) { switch (type) { case dcp::DCP_PROGRESS: - do_log (shared_ptr (new StringLogEntry (LogEntry::TYPE_GENERAL, m))); + do_log (boost::make_shared (LogEntry::TYPE_GENERAL, m)); break; case dcp::DCP_ERROR: - do_log (shared_ptr (new StringLogEntry (LogEntry::TYPE_ERROR, m))); + do_log (boost::make_shared (LogEntry::TYPE_ERROR, m)); break; case dcp::DCP_NOTE: - do_log (shared_ptr (new StringLogEntry (LogEntry::TYPE_WARNING, m))); + do_log (boost::make_shared (LogEntry::TYPE_WARNING, m)); break; } }