2.0. More header optimizations.

[casparcg] / common / log / log.h

diff --git a/common/log/log.h b/common/log/log.h
index 1cde097ef17195b6cc0214090ed3d8bb9c085e3a..1e81522a7796e5665aea698fe99e7f010cbbbdc3 100644 (file)
--- a/common/log/log.h
+++ b/common/log/log.h
@@ -1,3 +1,22 @@
+/*\r
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+*\r
+*  This file is part of CasparCG.\r
+*\r
+*    CasparCG is free software: you can redistribute it and/or modify\r
+*    it under the terms of the GNU General Public License as published by\r
+*    the Free Software Foundation, either version 3 of the License, or\r
+*    (at your option) any later version.\r
+*\r
+*    CasparCG is distributed in the hope that it will be useful,\r
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+*    GNU General Public License for more details.\r
+\r
+*    You should have received a copy of the GNU General Public License\r
+*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+*/\r
 #pragma once\r
 \r
 #if defined(_MSC_VER)\r
@@ -15,8 +34,6 @@
 #include <boost/log/sources/severity_logger.hpp>\r
 #include <boost/log/sources/record_ostream.hpp>\r
 \r
-#include "../utility/string_convert.h"\r
-\r
 namespace caspar { namespace log {\r
        \r
 namespace internal{\r
@@ -71,7 +88,7 @@ BOOST_LOG_DECLARE_GLOBAL_LOGGER_INIT(logger, caspar_logger)
 \r
 #define CASPAR_LOG_CURRENT_EXCEPTION() \\r
        try\\r
-       {CASPAR_LOG(error) << caspar::widen(boost::current_exception_diagnostic_information());}\\r
+       {CASPAR_LOG(error) << boost::current_exception_diagnostic_information().c_str();}\\r
        catch(...){}\r
 \r
 }}\r