blob: 53441d4a6ac71b699e2bff8d951888741f5a72c4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- a/src/BasicLayout.cpp
+++ b/src/BasicLayout.cpp
@@ -17,6 +17,8 @@
#include <sstream>
#endif
+#include <memory>
+
namespace log4cpp {
BasicLayout::BasicLayout() {
--- a/src/PatternLayout.cpp
+++ b/src/PatternLayout.cpp
@@ -373,7 +373,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);
--- a/tests/testDailyRollingFileAppender.cpp
+++ b/tests/testDailyRollingFileAppender.cpp
@@ -40,7 +40,7 @@
#else
#define PATHDELIMITER "\\"
#endif
-const char* const nesteddirname = "nesteddir"PATHDELIMITER;
+const char* const nesteddirname = "nesteddir" PATHDELIMITER;
class DailyRollingTest {
|
GitWeb
