From 7639db8cec67fde349e41076738336a9d6ebe55d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 15 Jun 2016 19:41:28 +0300 Subject: Fix compilation with gcc 4.4 and add exception into deheader script. --- src/resources/map/map.cpp | 2 -- tools/ci/jobs/deheader2.sh | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index e0454ea8c..e86c0c2a4 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -69,9 +69,7 @@ #include -#ifdef ENABLE_PUGIXML #include -#endif // ENABLE_LIBXML #include "debug.h" diff --git a/tools/ci/jobs/deheader2.sh b/tools/ci/jobs/deheader2.sh index f355760ad..ced2aeea7 100755 --- a/tools/ci/jobs/deheader2.sh +++ b/tools/ci/jobs/deheader2.sh @@ -22,6 +22,7 @@ grep "deheader:" ${LOGFILE} \ | grep -v "deheader: remove from ./src/net/sdltcpnet.cpp" \ | grep -v "deheader: remove from ./src/net/sdltcpnet.cpp" \ | grep -v "deheader: remove from ./src/net/sdltcpnet.cpp" \ +| grep -v "deheader: remove from ./src/resources/map/map.cpp" \ | grep -v "deheader: remove from ./src/units.cpp" > ${LOGFILE2} export DATA=$(cat ${LOGFILE2}) -- cgit v1.2.3-60-g2f50