X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Flog%2Flog.h;h=1e81522a7796e5665aea698fe99e7f010cbbbdc3;hb=acfc5e815529d35adca06c5fd2a1a657d2cb9dea;hp=1cde097ef17195b6cc0214090ed3d8bb9c085e3a;hpb=481a1e56c2d54a9ae3aa3fcd8b2f07f07d7191a6;p=casparcg

diff --git a/common/log/log.h b/common/log/log.h
index 1cde097ef..1e81522a7 100644
--- a/common/log/log.h
+++ b/common/log/log.h
@@ -1,3 +1,22 @@
+/*
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
+*
+*  This file is part of CasparCG.
+*
+*    CasparCG 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 3 of the License, or
+*    (at your option) any later version.
+*
+*    CasparCG 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 CasparCG.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 #pragma once
 
 #if defined(_MSC_VER)
@@ -15,8 +34,6 @@
 #include <boost/log/sources/severity_logger.hpp>
 #include <boost/log/sources/record_ostream.hpp>
 
-#include "../utility/string_convert.h"
-
 namespace caspar { namespace log {
 	
 namespace internal{
@@ -71,7 +88,7 @@ BOOST_LOG_DECLARE_GLOBAL_LOGGER_INIT(logger, caspar_logger)
 
 #define CASPAR_LOG_CURRENT_EXCEPTION() \
 	try\
-	{CASPAR_LOG(error) << caspar::widen(boost::current_exception_diagnostic_information());}\
+	{CASPAR_LOG(error) << boost::current_exception_diagnostic_information().c_str();}\
 	catch(...){}
 
 }}