summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-07-25 08:22:44 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-07-25 08:26:00 (GMT)
commiteb34b4ea4250c36d951b14d7efce56de948be41f (patch)
tree75124cb2235f52e61135d733dace75c5ad32033d /src
parent14b51faf69b27d605c53fa0d2813b6abb00703b5 (diff)
downloadmxe-eb34b4ea4250c36d951b14d7efce56de948be41f.zip
mxe-eb34b4ea4250c36d951b14d7efce56de948be41f.tar.gz
mxe-eb34b4ea4250c36d951b14d7efce56de948be41f.tar.bz2
log4cxx: add patch header
Diffstat (limited to 'src')
-rw-r--r--src/log4cxx-5-gcc6-fix-narrowing-conversion.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/log4cxx-5-gcc6-fix-narrowing-conversion.patch b/src/log4cxx-5-gcc6-fix-narrowing-conversion.patch
index 48c744e..ad07961 100644
--- a/src/log4cxx-5-gcc6-fix-narrowing-conversion.patch
+++ b/src/log4cxx-5-gcc6-fix-narrowing-conversion.patch
@@ -1,3 +1,20 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+taken from:
+https://github.com/mxe/mxe/pull/1817
+
+g++ 6 is stricter regarding narrowing conversions in initializer
+lists. This causes errors similar to the following during compilation
+with the gcc6 or gcc7 overlays:
+```
+locationinfo.cpp:163:21: error: narrowing conversion of '237'
+from 'int' to 'char' inside { } [-Wnarrowing]
+```
+This has already been fixed upstream in several consecutive patches,
+but there's no release including those fixes yet. This patch consists
+of the essence of said fixes.
+
+
diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp
index e76ea29..1cdcf24 100644
--- a/src/main/cpp/locationinfo.cpp