[Freeorion-programmers] SF.net SVN: freeorion:[2731] trunk/FreeOrion/log4cpp/src

[<kr...@us...>]

Revision: 2731
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2731&view=rev
Author:   kroddn
Date:     2009-01-10 23:18:35 +0000 (Sat, 10 Jan 2009)

Log Message:
-----------
Fixed Bug in Log4cpp according to http://bugs.gentoo.org/show_bug.cgi?id=217755

Modified Paths:
--------------
    trunk/FreeOrion/log4cpp/src/BasicLayout.cpp
    trunk/FreeOrion/log4cpp/src/PatternLayout.cpp

Modified: trunk/FreeOrion/log4cpp/src/BasicLayout.cpp
===================================================================
--- trunk/FreeOrion/log4cpp/src/BasicLayout.cpp	2009-01-09 15:23:48 UTC (rev 2730)
+++ trunk/FreeOrion/log4cpp/src/BasicLayout.cpp	2009-01-10 23:18:35 UTC (rev 2731)
@@ -15,6 +15,8 @@
 #include <sstream>
 #endif
 
+#include <memory>
+
 namespace log4cpp {
 
     BasicLayout::BasicLayout() {

Modified: trunk/FreeOrion/log4cpp/src/PatternLayout.cpp
===================================================================
--- trunk/FreeOrion/log4cpp/src/PatternLayout.cpp	2009-01-09 15:23:48 UTC (rev 2730)
+++ trunk/FreeOrion/log4cpp/src/PatternLayout.cpp	2009-01-10 23:18:35 UTC (rev 2731)
@@ -370,7 +370,7 @@
                         literal = "";
                     }
                     if ((minWidth != 0) || (maxWidth != 0)) {
-                        component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0);
+                        component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0);
                         minWidth = maxWidth = 0;
                     }
                     _components.push_back(component);