Ignore libxml++ warnings in a nicer way.

diff --git a/src/lib/analytics.cc b/src/lib/analytics.cc
index 34f67116e3a7355ea42dc6ee5cf1c0ad6ae1491b..f20b213e4ab13f511d73f351df99ef7b4533bc92 100644 (file)
--- a/src/lib/analytics.cc
+++ b/src/lib/analytics.cc
@@ -21,9 +21,12 @@
 #include "analytics.h"
 #include "exceptions.h"
 #include "compose.hpp"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 

diff --git a/src/lib/atmos_content.cc b/src/lib/atmos_content.cc
index 2e59b92b7f288d1653189efd9399a2d7803730b1..0543437a30ca06e7a44ea6a3fbf0249fec2d96ab 100644 (file)
--- a/src/lib/atmos_content.cc
+++ b/src/lib/atmos_content.cc
@@ -20,8 +20,11 @@
 
 
 #include "atmos_content.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 446fcccef1607323d7851dbffe98114cda5fb841..f69bcd362db164e23c31e01d73bdf3399f01b9e9 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -23,8 +23,11 @@
 #include "util.h"
 #include "playlist.h"
 #include "audio_content.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <stdint.h>

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 05dfb7e897de8bb1c23cdfdb01c9390519cd3d52..94efbe49bff57a416e87dcc284d6d3a11d6df7e7 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -19,12 +19,15 @@
 */
 
 #include "audio_mapping.h"
-#include "util.h"
-#include "digester.h"
 #include "audio_processor.h"
+#include "digester.h"
+#include "util.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/regex.hpp>
 #include <iostream>
 

diff --git a/src/lib/audio_point.cc b/src/lib/audio_point.cc
index b5ea2c31e6b0a81616536b05a2dd8bfe3911255b..722673b961337a5057a42beb8bc5164fd0f5058d 100644 (file)
--- a/src/lib/audio_point.cc
+++ b/src/lib/audio_point.cc
@@ -19,8 +19,11 @@
 */
 
 #include "audio_point.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::string;
 using dcp::raw_convert;

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 2e052060e2b247ad9f26dbd51c54399b952f9c91..22404c2796d165fe0716ea461ac36ad3a0e187fd 100644 (file)
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -22,6 +22,7 @@
 #include "colour_conversion.h"
 #include "util.h"
 #include "digester.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/chromaticity.h>
 #include <dcp/gamma_transfer_function.h>
@@ -29,7 +30,9 @@
 #include <dcp/identity_transfer_function.h>
 #include <dcp/s_gamut3_transfer_function.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 #include <iostream>
 

diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index cf220fe53f4b9377dc5d4fe391d8d6ab483efd8b..edc806b584fed235a947e53a46751725bac7424c 100644 (file)
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -21,9 +21,12 @@
 #include "cross.h"
 #include "compose.hpp"
 #include "dcpomatic_log.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <boost/foreach.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"

diff --git a/src/lib/dcp_text_track.h b/src/lib/dcp_text_track.h
index 913e77fa59cdb08f0500ebdf862a6dc2df8a4a88..e6a146b3b1b1f8f919f7a0e7aa5d69e0565e654c 100644 (file)
--- a/src/lib/dcp_text_track.h
+++ b/src/lib/dcp_text_track.h
@@ -21,8 +21,11 @@
 #ifndef DCPOMATIC_DCP_TEXT_TRACK_H
 #define DCPOMATIC_DCP_TEXT_TRACK_H
 
+#include "warnings.h"
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class DCPTextTrack
 {

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 7b06f8cfca3cd6975b3a63c63d00598b4004fb12..d6b9d4f278fb20a9437cbaecbce9e860dd6f26be 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -39,12 +39,15 @@
 #include "cross.h"
 #include "player_video.h"
 #include "compose.hpp"
+#include "warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <stdint.h>

diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc
index 0dd37b464c6db6453a1bfc2d56459b48321dca9a..6638bc315bb3936c9e4933abbf3065580c93ecb2 100644 (file)
--- a/src/lib/dkdm_wrapper.cc
+++ b/src/lib/dkdm_wrapper.cc
@@ -21,7 +21,10 @@
 #include "compose.hpp"
 #include "dkdm_wrapper.h"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 
 using std::string;

diff --git a/src/lib/edid.cc b/src/lib/edid.cc
index 3df65d325ca6ce1ec7767c5f1162c07fdbfea2f5..a530b8e3825f8c10523bf8209b2d9253a23a81d9 100644 (file)
--- a/src/lib/edid.cc
+++ b/src/lib/edid.cc
@@ -20,8 +20,11 @@
 
 #include "compose.hpp"
 #include "edid.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index c242cb216acac2a45d4a98f3d63d823fc53a2329..61e0b09c58f1a340460791c02c7ead7aef417b8a 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -36,9 +36,12 @@
 #include "dcpomatic_log.h"
 #include "encoded_log_entry.h"
 #include "version.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/foreach.hpp>

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index 1fc008d51a22cc5a621ea499fdf6d48d7f3528bb..32828f13a84878e3dda72ae54a997fa983ae11e1 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.cc
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -20,7 +20,10 @@
 
 #include "ffmpeg_audio_stream.h"
 #include <dcp/raw_convert.h>
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
 
 using std::string;

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index db6059266dc472e13b8908a67f5baf0b2a800618..b54e29d4492c4e3ee1933777f72e5b9e1f932a48 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -25,12 +25,15 @@
 #include "image.h"
 #include "compose.hpp"
 #include "util.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"

diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
index 86108ce4d1ea24ab38bf5ed29634344608376e1f..60327ab0d9d87c0f199215da1f05dda10dd67dd8 100644 (file)
--- a/src/lib/ffmpeg_stream.cc
+++ b/src/lib/ffmpeg_stream.cc
@@ -20,8 +20,11 @@
 
 #include "ffmpeg_stream.h"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 extern "C" {
 #include <libavformat/avformat.h>
 }

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index da8bafc0af788a3c76328b6b7ef5a54445f2c1f1..72698fa51cc49b2a947abde2fedf87ed2d461cd8 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -19,8 +19,11 @@
 */
 
 #include "ffmpeg_subtitle_stream.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 #include <iostream>
 

diff --git a/src/lib/font.cc b/src/lib/font.cc
index 019c9ab076fe8f83e362c8030f2542b4beceb1df..a52957376298d9873570b1c33b458bbaaba46711 100644 (file)
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -20,7 +20,10 @@
 
 #include "font.h"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 
 using std::string;

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index c333325a126f52b1b8321ecf83809d70b2e93827..f4b25662648788856ffb2de692d2a8738b6ff12d 100644 (file)
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -19,9 +19,12 @@
 */
 
 #include "isdcf_metadata.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index acf8bb05235e7018216824bfd484f0fa533b5d6a..08ebc343c26ce7cf8e9407582d215f80f2914e0b 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -22,6 +22,7 @@
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
@@ -30,7 +31,9 @@
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"

diff --git a/src/lib/kdm_recipient.h b/src/lib/kdm_recipient.h
index b68b4b7c75e2cabc20783fd2dbeadf3f3243058c..e92fc3c48d5bb8e17ded5c01052383abd5c6dbe2 100644 (file)
--- a/src/lib/kdm_recipient.h
+++ b/src/lib/kdm_recipient.h
@@ -21,9 +21,12 @@
 #ifndef DCPOMATIC_KDM_RECIPIENT_H
 #define DCPOMATIC_KDM_RECIPIENT_H
 
+#include "warnings.h"
 #include <dcp/certificate.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 #include <string>
 

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 2509bd0d46f460390e6fb5b72b54c51d0b59bf9c..09902c3a29b5c0a5844b83fe50f932e5039b34e0 100644 (file)
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -20,13 +20,16 @@
 
 #include "raw_image_proxy.h"
 #include "image.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/util.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 #include "i18n.h"
 

diff --git a/src/lib/rgba.cc b/src/lib/rgba.cc
index 6d58d97d188af6a455b8545988fcd83ab06c8639..1076af4335574a65c165cdbe81415cb8cfe073bc 100644 (file)
--- a/src/lib/rgba.cc
+++ b/src/lib/rgba.cc
@@ -19,7 +19,10 @@
 */
 
 #include "rgba.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/lexical_cast.hpp>
 
 using std::string;

diff --git a/src/lib/spl.cc b/src/lib/spl.cc
index ccf809f8bc5523f2e98dd81f4b9a84bfe40cb157..7692df0cab1680d9800423c629eed32003e6e5db 100644 (file)
--- a/src/lib/spl.cc
+++ b/src/lib/spl.cc
@@ -18,11 +18,14 @@
 
 */
 
-#include "spl.h"
 #include "content_store.h"
+#include "spl.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 #include <iostream>
 

diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc
index 5b011a04654ec747dfe44a97e58c28039e1d3752..3cb1a9a363b5adecd833bce9d7aca8d84ddefc8a 100644 (file)
--- a/src/lib/spl_entry.cc
+++ b/src/lib/spl_entry.cc
@@ -21,7 +21,10 @@
 #include "spl_entry.h"
 #include "dcp_content.h"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;

diff --git a/src/lib/subtitle_analysis.cc b/src/lib/subtitle_analysis.cc
index f8254f00d62fa791742d097812445801e727a7d6..e6e8f310f4993ab375df09f6e5494dac5264f400 100644 (file)
--- a/src/lib/subtitle_analysis.cc
+++ b/src/lib/subtitle_analysis.cc
@@ -20,9 +20,12 @@
 
 #include "subtitle_analysis.h"
 #include "exceptions.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::string;
 using dcp::raw_convert;

diff --git a/src/lib/types.cc b/src/lib/types.cc
index d2df7f1a8332219714a927bf15317a155f660420..df57f2d47143a470b1ed88ae11a6e0ac699abf4b 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -21,12 +21,15 @@
 #include "types.h"
 #include "compose.hpp"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel_mxf.h>
 #include <dcp/reel_asset.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
 #include <boost/foreach.hpp>
 

diff --git a/test/stream_test.cc b/test/stream_test.cc
index 1e146246487ec972a5e8bfd8e162a0ded5abef4e..b4b7c260b8015cb90ddcaa13ea77fc8f5b472e4f 100644 (file)
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -22,12 +22,15 @@
  *  @brief Some simple tests of FFmpegAudioStream.
  */
 
-#include <boost/test/unit_test.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
+#include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
-#include "lib/film.h"
+#include "lib/warnings.h"
+#include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
+#include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/test/unit_test.hpp>
 
 using std::pair;
 using std::list;