Fix/hide some warnings.

53 files changed, 241 insertions, 144 deletions

diff --git a/src/array_data.h b/src/array_data.h
index 69962bf2..da7229bb 100644
--- a/src/array_data.h
+++ b/src/array_data.h
@@ -71,18 +71,18 @@ public:
 
 	virtual ~ArrayData () {}
 
-	uint8_t const * data () const {
+	uint8_t const * data () const override {
 		return _data.get();
 	}
 
-	uint8_t * data () {
+	uint8_t * data () override {
 		return _data.get();
 	}
 
 	/** @return size of the data in _data, or whatever was last
 	 *  passed to a set_size() call
 	 */
-	int size () const {
+	int size () const override {
 		return _size;
 	}
 
diff --git a/src/asset.cc b/src/asset.cc
index e6822903..6e200b0d 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -37,14 +37,17 @@
  */
 
 
-#include "raw_convert.h"
 #include "asset.h"
-#include "util.h"
-#include "exceptions.h"
-#include "dcp_assert.h"
 #include "compose.hpp"
+#include "dcp_assert.h"
+#include "exceptions.h"
 #include "pkl.h"
+#include "raw_convert.h"
+#include "util.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 
 
diff --git a/src/asset_factory.h b/src/asset_factory.h
index 4bab9bee..2dd04559 100644
--- a/src/asset_factory.h
+++ b/src/asset_factory.h
@@ -37,9 +37,16 @@
  */
 
 
+#include <boost/filesystem.hpp>
+#include <memory>
+
+
 namespace dcp {
 
 
+class Asset;
+
+
 std::shared_ptr<Asset> asset_factory (boost::filesystem::path path, bool ignore_incorrect_picture_mxf_type);
 
 
diff --git a/src/atmos_asset.h b/src/atmos_asset.h
index 7ee55d92..a682ae60 100644
--- a/src/atmos_asset.h
+++ b/src/atmos_asset.h
@@ -65,7 +65,7 @@ public:
 	std::shared_ptr<AtmosAssetReader> start_read () const;
 
 	static std::string static_pkl_type (Standard);
-	std::string pkl_type (Standard s) const {
+	std::string pkl_type (Standard s) const override {
 		return static_pkl_type (s);
 	}
 
diff --git a/src/atmos_asset_writer.h b/src/atmos_asset_writer.h
index f70c42f5..eebb0d6c 100644
--- a/src/atmos_asset_writer.h
+++ b/src/atmos_asset_writer.h
@@ -64,7 +64,7 @@ class AtmosAssetWriter : public AssetWriter
 public:
 	void write (std::shared_ptr<const AtmosFrame> frame);
 	void write (uint8_t const * data, int size);
-	bool finalize ();
+	bool finalize () override;
 
 private:
 	friend class AtmosAsset;
diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc
index 4f86ba0d..5ff9b294 100644
--- a/src/certificate_chain.cc
+++ b/src/certificate_chain.cc
@@ -38,13 +38,16 @@
 
 
 #include "certificate_chain.h"
+#include "compose.hpp"
+#include "dcp_assert.h"
 #include "exceptions.h"
 #include "util.h"
-#include "dcp_assert.h"
-#include "compose.hpp"
+#include "warnings.h"
 #include <asdcp/KM_util.h>
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/dl.h>
 #include <xmlsec/app.h>
diff --git a/src/cpl.cc b/src/cpl.cc
index 145ce1cd..0eb25052 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -37,24 +37,29 @@
  */
 
 
+#include "certificate_chain.h"
+#include "compose.hpp"
 #include "cpl.h"
-#include "util.h"
-#include "reel.h"
+#include "dcp_assert.h"
+#include "local_time.h"
 #include "metadata.h"
-#include "certificate_chain.h"
-#include "xml.h"
+#include "raw_convert.h"
+#include "reel.h"
+#include "reel_atmos_asset.h"
+#include "reel_closed_caption_asset.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
-#include "reel_closed_caption_asset.h"
-#include "reel_atmos_asset.h"
-#include "local_time.h"
-#include "dcp_assert.h"
-#include "compose.hpp"
-#include "raw_convert.h"
+#include "util.h"
+#include "warnings.h"
+#include "xml.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/Metadata.h>
+LIBDCP_ENABLE_WARNINGS
 #include <libxml/parser.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 
 
diff --git a/src/cpl.h b/src/cpl.h
index 246233c1..797c49d2 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -81,7 +81,7 @@ public:
 		std::shared_ptr<const Asset> other,
 		EqualityOptions options,
 		NoteHandler note
-		) const;
+		) const override;
 
 	/** Add a reel to this CPL
 	 *  @param reel Reel to add
@@ -307,7 +307,7 @@ public:
 
 protected:
 	/** @return type string for PKLs for this asset */
-	std::string pkl_type (Standard standard) const;
+	std::string pkl_type (Standard standard) const override;
 
 private:
 	friend struct ::verify_invalid_language3;
diff --git a/src/dcp.cc b/src/dcp.cc
index bcf487e1..c72bef63 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -37,34 +37,39 @@
  */
 
 
-#include "raw_convert.h"
-#include "dcp.h"
-#include "sound_asset.h"
+#include "asset_factory.h"
 #include "atmos_asset.h"
-#include "picture_asset.h"
-#include "interop_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "stereo_picture_asset.h"
-#include "reel_subtitle_asset.h"
-#include "util.h"
-#include "metadata.h"
-#include "exceptions.h"
-#include "cpl.h"
 #include "certificate_chain.h"
 #include "compose.hpp"
+#include "cpl.h"
+#include "dcp.h"
+#include "dcp_assert.h"
 #include "decrypted_kdm.h"
 #include "decrypted_kdm_key.h"
-#include "dcp_assert.h"
-#include "reel_asset.h"
+#include "exceptions.h"
 #include "font_asset.h"
+#include "interop_subtitle_asset.h"
+#include "metadata.h"
+#include "mono_picture_asset.h"
+#include "picture_asset.h"
 #include "pkl.h"
-#include "asset_factory.h"
+#include "raw_convert.h"
+#include "reel_asset.h"
+#include "reel_subtitle_asset.h"
+#include "smpte_subtitle_asset.h"
+#include "sound_asset.h"
+#include "stereo_picture_asset.h"
+#include "util.h"
 #include "verify.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
+LIBDCP_ENABLE_WARNINGS
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/app.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <numeric>
diff --git a/src/font_asset.h b/src/font_asset.h
index d39a6b24..7d1c5552 100644
--- a/src/font_asset.h
+++ b/src/font_asset.h
@@ -54,7 +54,7 @@ public:
 	static std::string static_pkl_type (Standard standard);
 
 private:
-	std::string pkl_type (Standard standard) const {
+	std::string pkl_type (Standard standard) const override {
 		return static_pkl_type (standard);
 	}
 };
diff --git a/src/gamma_transfer_function.h b/src/gamma_transfer_function.h
index a7bdd44d..8402d6af 100644
--- a/src/gamma_transfer_function.h
+++ b/src/gamma_transfer_function.h
@@ -55,10 +55,10 @@ public:
 		return _gamma;
 	}
 
-	bool about_equal (std::shared_ptr<const TransferFunction> other, double epsilon) const;
+	bool about_equal (std::shared_ptr<const TransferFunction> other, double epsilon) const override;
 
 protected:
-	double * make_lut (int bit_depth, bool inverse) const;
+	double * make_lut (int bit_depth, bool inverse) const override;
 
 private:
 	double _gamma;
diff --git a/src/identity_transfer_function.h b/src/identity_transfer_function.h
index ff6814eb..de7a897a 100644
--- a/src/identity_transfer_function.h
+++ b/src/identity_transfer_function.h
@@ -46,10 +46,10 @@ namespace dcp {
 class IdentityTransferFunction : public TransferFunction
 {
 public:
-	bool about_equal (std::shared_ptr<const TransferFunction> other, double epsilon) const;
+	bool about_equal (std::shared_ptr<const TransferFunction> other, double epsilon) const override;
 
 protected:
-	double * make_lut (int bit_depth, bool inverse) const;
+	double * make_lut (int bit_depth, bool inverse) const override;
 };
 
 
diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index 938c028e..453cad8b 100644
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -37,17 +37,20 @@
  */
 
 
-#include "interop_subtitle_asset.h"
+#include "compose.hpp"
+#include "dcp_assert.h"
+#include "font_asset.h"
 #include "interop_load_font_node.h"
-#include "subtitle_asset_internal.h"
-#include "xml.h"
+#include "interop_subtitle_asset.h"
 #include "raw_convert.h"
-#include "util.h"
-#include "font_asset.h"
-#include "dcp_assert.h"
-#include "compose.hpp"
+#include "subtitle_asset_internal.h"
 #include "subtitle_image.h"
+#include "util.h"
+#include "warnings.h"
+#include "xml.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/weak_ptr.hpp>
 #include <cmath>
 #include <cstdio>
diff --git a/src/key.h b/src/key.h
index d51150c4..b0f33d0d 100644
--- a/src/key.h
+++ b/src/key.h
@@ -41,7 +41,10 @@
 #define LIBDCP_KEY_H
 
 
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
+LIBDCP_ENABLE_WARNINGS
 #include <stdint.h>
 #include <string>
 
diff --git a/src/language_tag.h b/src/language_tag.h
index d18572e4..6b4bebe6 100644
--- a/src/language_tag.h
+++ b/src/language_tag.h
@@ -112,7 +112,7 @@ public:
 		LanguageSubtag (char const* subtag)
 			: Subtag(subtag, SubtagType::LANGUAGE) {}
 
-		SubtagType type () const {
+		SubtagType type () const override {
 			return SubtagType::LANGUAGE;
 		}
 	};
@@ -125,7 +125,7 @@ public:
 		ScriptSubtag (char const* subtag)
 			: Subtag(subtag, SubtagType::SCRIPT) {}
 
-		SubtagType type () const {
+		SubtagType type () const override {
 			return SubtagType::SCRIPT;
 		}
 	};
@@ -138,7 +138,7 @@ public:
 		RegionSubtag (char const* subtag)
 			: Subtag(subtag, SubtagType::REGION) {}
 
-		SubtagType type () const {
+		SubtagType type () const override {
 			return SubtagType::REGION;
 		}
 	};
@@ -151,7 +151,7 @@ public:
 		VariantSubtag (char const* subtag)
 			: Subtag(subtag, SubtagType::VARIANT) {}
 
-		SubtagType type () const {
+		SubtagType type () const override {
 			return SubtagType::VARIANT;
 		}
 
@@ -168,7 +168,7 @@ public:
 		ExtlangSubtag (char const* subtag)
 			: Subtag(subtag, SubtagType::EXTLANG) {}
 
-		SubtagType type () const {
+		SubtagType type () const override {
 			return SubtagType::EXTLANG;
 		}
 
diff --git a/src/modified_gamma_transfer_function.h b/src/modified_gamma_transfer_function.h
index 70018cbf..34904855 100644
--- a/src/modified_gamma_transfer_function.h
+++ b/src/modified_gamma_transfer_function.h
@@ -74,10 +74,10 @@ public:
 		return _B;
 	}
 
-	bool about_equal (std::shared_ptr<const TransferFunction>, double epsilon) const;
+	bool about_equal (std::shared_ptr<const TransferFunction>, double epsilon) const override;
 
 protected:
-	double * make_lut (int bit_depth, bool inverse) const;
+	double * make_lut (int bit_depth, bool inverse) const override;
 
 private:
 	double _power;
diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index dec120cb..1abdcccc 100644
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -37,13 +37,16 @@
  */
 
 
-#include "mono_picture_asset_writer.h"
+#include "crypto_context.h"
+#include "dcp_assert.h"
 #include "exceptions.h"
+#include "mono_picture_asset_writer.h"
 #include "picture_asset.h"
-#include "dcp_assert.h"
-#include "crypto_context.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 #include "picture_asset_writer_common.cc"
diff --git a/src/mono_picture_asset_writer.h b/src/mono_picture_asset_writer.h
index 9dffaa24..724e4ece 100644
--- a/src/mono_picture_asset_writer.h
+++ b/src/mono_picture_asset_writer.h
@@ -64,9 +64,9 @@ namespace dcp {
 class MonoPictureAssetWriter : public PictureAssetWriter
 {
 public:
-	FrameInfo write (uint8_t const *, int);
-	void fake_write (int size);
-	bool finalize ();
+	FrameInfo write (uint8_t const *, int) override;
+	void fake_write (int size) override;
+	bool finalize () override;
 
 private:
 	friend class MonoPictureAsset;
diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 52cf7965..95b0d111 100644
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -87,13 +87,13 @@ public:
 	std::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
 
 	/** @return Pointer to JPEG2000 data */
-	uint8_t const * data () const;
+	uint8_t const * data () const override;
 
 	/** @return Pointer to JPEG2000 data */
-	uint8_t* data ();
+	uint8_t* data () override;
 
 	/** @return Size of JPEG2000 data in bytes */
-	int size () const;
+	int size () const override;
 
 private:
 	/* XXX: this is a bit of a shame, but I tried friend MonoPictureAssetReader and it's
diff --git a/src/picture_asset.h b/src/picture_asset.h
index 6ee3bd24..011dea87 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -140,7 +140,7 @@ protected:
 	Fraction _screen_aspect_ratio;
 
 private:
-	std::string pkl_type (Standard standard) const;
+	std::string pkl_type (Standard standard) const override;
 };
 
 
diff --git a/src/pkl.cc b/src/pkl.cc
index 9cec68be..22589b4d 100644
--- a/src/pkl.cc
+++ b/src/pkl.cc
@@ -37,12 +37,15 @@
  */
 
 
-#include "pkl.h"
+#include "dcp_assert.h"
 #include "exceptions.h"
-#include "util.h"
+#include "pkl.h"
 #include "raw_convert.h"
-#include "dcp_assert.h"
+#include "util.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 
diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index 1a6a25be..d233ee64 100644
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -37,13 +37,16 @@
  */
 
 
-#include "raw_convert.h"
-#include "reel_asset.h"
 #include "asset.h"
 #include "compose.hpp"
 #include "dcp_assert.h"
+#include "raw_convert.h"
+#include "reel_asset.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::pair;
diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index 1df26ce9..fe30cea2 100644
--- a/src/reel_atmos_asset.cc
+++ b/src/reel_atmos_asset.cc
@@ -39,8 +39,11 @@
 
 #include "atmos_asset.h"
 #include "reel_atmos_asset.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
diff --git a/src/reel_closed_caption_asset.cc b/src/reel_closed_caption_asset.cc
index 3e4627d3..7d22c0b8 100644
--- a/src/reel_closed_caption_asset.cc
+++ b/src/reel_closed_caption_asset.cc
@@ -37,11 +37,14 @@
  */
 
 
-#include "subtitle_asset.h"
+#include "dcp_assert.h"
 #include "reel_closed_caption_asset.h"
 #include "smpte_subtitle_asset.h"
-#include "dcp_assert.h"
+#include "subtitle_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
diff --git a/src/reel_file_asset.cc b/src/reel_file_asset.cc
index 1ca77b4d..dc8ea21f 100644
--- a/src/reel_file_asset.cc
+++ b/src/reel_file_asset.cc
@@ -39,7 +39,10 @@
 
 #include "asset.h"
 #include "reel_file_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
diff --git a/src/reel_interop_closed_caption_asset.cc b/src/reel_interop_closed_caption_asset.cc
index 3e85b135..be968068 100644
--- a/src/reel_interop_closed_caption_asset.cc
+++ b/src/reel_interop_closed_caption_asset.cc
@@ -33,7 +33,10 @@
 
 
 #include "reel_interop_closed_caption_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::make_pair;
diff --git a/src/reel_interop_closed_caption_asset.h b/src/reel_interop_closed_caption_asset.h
index ec954346..dd60ad71 100644
--- a/src/reel_interop_closed_caption_asset.h
+++ b/src/reel_interop_closed_caption_asset.h
@@ -65,7 +65,7 @@ public:
 	xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const override;
 
 private:
-	std::string cpl_node_name (Standard) const;
+	std::string cpl_node_name (Standard) const override;
 	std::pair<std::string, std::string> cpl_node_namespace () const override;
 };
 
diff --git a/src/reel_interop_subtitle_asset.cc b/src/reel_interop_subtitle_asset.cc
index 08ea4bb4..5f295d53 100644
--- a/src/reel_interop_subtitle_asset.cc
+++ b/src/reel_interop_subtitle_asset.cc
@@ -38,7 +38,10 @@
 
 
 #include "reel_interop_subtitle_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc
index 55a50a68..0dd3cf29 100644
--- a/src/reel_markers_asset.cc
+++ b/src/reel_markers_asset.cc
@@ -37,10 +37,13 @@
  */
 
 
-#include "reel_markers_asset.h"
-#include "raw_convert.h"
 #include "dcp_assert.h"
+#include "raw_convert.h"
+#include "reel_markers_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
diff --git a/src/reel_markers_asset.h b/src/reel_markers_asset.h
index 1eae47ef..e3fbb962 100644
--- a/src/reel_markers_asset.h
+++ b/src/reel_markers_asset.h
@@ -51,7 +51,7 @@ public:
 	ReelMarkersAsset (Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
 	explicit ReelMarkersAsset (std::shared_ptr<const cxml::Node>);
 
-	xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
+	xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const override;
 	bool equals (std::shared_ptr<const ReelMarkersAsset>, EqualityOptions, NoteHandler) const;
 
 	void set (Marker, Time);
@@ -62,7 +62,7 @@ public:
 	}
 
 protected:
-	std::string cpl_node_name (Standard) const;
+	std::string cpl_node_name (Standard) const override;
 
 private:
 	std::map<Marker, Time> _markers;
diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h
index 50e904b2..fb2dff70 100644
--- a/src/reel_mono_picture_asset.h
+++ b/src/reel_mono_picture_asset.h
@@ -71,7 +71,7 @@ public:
 	}
 
 private:
-	std::string cpl_node_name (Standard standard) const;
+	std::string cpl_node_name (Standard standard) const override;
 };
 
 
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 4f7f863f..2e51fec5 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -37,13 +37,16 @@
  */
 
 
-#include "reel_picture_asset.h"
-#include "picture_asset.h"
+#include "compose.hpp"
 #include "dcp_assert.h"
+#include "picture_asset.h"
 #include "raw_convert.h"
-#include "compose.hpp"
+#include "reel_picture_asset.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <iomanip>
 #include <cmath>
 
diff --git a/src/reel_smpte_closed_caption_asset.cc b/src/reel_smpte_closed_caption_asset.cc
index 34fba18b..a2a68202 100644
--- a/src/reel_smpte_closed_caption_asset.cc
+++ b/src/reel_smpte_closed_caption_asset.cc
@@ -38,7 +38,10 @@
 
 
 #include "reel_smpte_closed_caption_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::make_pair;
diff --git a/src/reel_smpte_subtitle_asset.cc b/src/reel_smpte_subtitle_asset.cc
index 5a7c8c6c..64440547 100644
--- a/src/reel_smpte_subtitle_asset.cc
+++ b/src/reel_smpte_subtitle_asset.cc
@@ -39,7 +39,10 @@
 
 #include "reel_smpte_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index e944467f..76495c78 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -37,10 +37,13 @@
  */
 
 
-#include "reel_sound_asset.h"
 #include "dcp_assert.h"
+#include "reel_sound_asset.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index 5eee23be..181bf1d9 100644
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -68,8 +68,8 @@ public:
 	bool equals (std::shared_ptr<const ReelSoundAsset>, EqualityOptions, NoteHandler) const;
 
 private:
-	boost::optional<std::string> key_type () const;
-	std::string cpl_node_name (Standard standard) const;
+	boost::optional<std::string> key_type () const override;
+	std::string cpl_node_name (Standard standard) const override;
 };
 
 
diff --git a/src/reel_stereo_picture_asset.h b/src/reel_stereo_picture_asset.h
index beedc4a6..7cac1c8b 100644
--- a/src/reel_stereo_picture_asset.h
+++ b/src/reel_stereo_picture_asset.h
@@ -71,8 +71,8 @@ public:
 	}
 
 private:
-	std::string cpl_node_name (Standard standard) const;
-	std::pair<std::string, std::string> cpl_node_attribute (Standard standard) const;
+	std::string cpl_node_name (Standard standard) const override;
+	std::pair<std::string, std::string> cpl_node_attribute (Standard standard) const override;
 };
 
 
diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc
index e3ca2006..04f56788 100644
--- a/src/reel_subtitle_asset.cc
+++ b/src/reel_subtitle_asset.cc
@@ -38,10 +38,13 @@
 
 
 #include "language_tag.h"
-#include "subtitle_asset.h"
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
+#include "subtitle_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
diff --git a/src/s_gamut3_transfer_function.h b/src/s_gamut3_transfer_function.h
index 88a6a65a..0d297e8b 100644
--- a/src/s_gamut3_transfer_function.h
+++ b/src/s_gamut3_transfer_function.h
@@ -46,10 +46,10 @@ namespace dcp {
 class SGamut3TransferFunction : public TransferFunction
 {
 public:
-	bool about_equal (std::shared_ptr<const TransferFunction> other, double epsilon) const;
+	bool about_equal (std::shared_ptr<const TransferFunction> other, double epsilon) const override;
 
 protected:
-	double * make_lut (int bit_depth, bool inverse) const;
+	double * make_lut (int bit_depth, bool inverse) const override;
 };
 
 
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 6c3277ce..0fa315b9 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -37,20 +37,23 @@
  */
 
 
-#include "smpte_subtitle_asset.h"
-#include "smpte_load_font_node.h"
-#include "exceptions.h"
-#include "xml.h"
-#include "raw_convert.h"
-#include "dcp_assert.h"
-#include "util.h"
 #include "compose.hpp"
 #include "crypto_context.h"
+#include "dcp_assert.h"
+#include "exceptions.h"
+#include "raw_convert.h"
+#include "smpte_load_font_node.h"
+#include "smpte_subtitle_asset.h"
 #include "subtitle_image.h"
+#include "util.h"
+#include "warnings.h"
+#include "xml.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_util.h>
 #include <asdcp/KM_log.h>
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 
 
diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 6984b644..1ece2405 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -83,18 +83,18 @@ public:
 		std::shared_ptr<const Asset>,
 		EqualityOptions,
 		NoteHandler note
-		) const;
+		) const override;
 
-	std::vector<std::shared_ptr<LoadFontNode>> load_font_nodes () const;
+	std::vector<std::shared_ptr<LoadFontNode>> load_font_nodes () const override;
 
-	std::string xml_as_string () const;
+	std::string xml_as_string () const override;
 
 	/** Write this content to a MXF file */
-	void write (boost::filesystem::path path) const;
+	void write (boost::filesystem::path path) const override;
 
-	void add (std::shared_ptr<Subtitle>);
-	void add_font (std::string id, dcp::ArrayData data);
-	void set_key (Key key);
+	void add (std::shared_ptr<Subtitle>) override;
+	void add_font (std::string id, dcp::ArrayData data) override;
+	void set_key (Key key) override;
 
 	void set_content_title_text (std::string t) {
 		_content_title_text = t;
@@ -168,7 +168,7 @@ public:
 	 *  e.g. a time_code_rate of 250 means that a subtitle time of 0:0:0:001
 	 *  represents 4ms.
 	 */
-	int time_code_rate () const {
+	int time_code_rate () const override {
 		return _time_code_rate;
 	}
 
@@ -192,7 +192,7 @@ public:
 
 protected:
 
-	std::string pkl_type (Standard s) const {
+	std::string pkl_type (Standard s) const override {
 		return static_pkl_type (s);
 	}
 
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 4f0166d8..04234c23 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -37,17 +37,20 @@
  */
 
 
-#include "sound_asset.h"
-#include "util.h"
-#include "exceptions.h"
-#include "sound_frame.h"
-#include "sound_asset_writer.h"
-#include "sound_asset_reader.h"
 #include "compose.hpp"
 #include "dcp_assert.h"
+#include "exceptions.h"
+#include "sound_asset.h"
+#include "sound_asset_reader.h"
+#include "sound_asset_writer.h"
+#include "sound_frame.h"
+#include "util.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 #include <asdcp/Metadata.h>
+LIBDCP_ENABLE_WARNINGS
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <stdexcept>
diff --git a/src/sound_asset.h b/src/sound_asset.h
index 79edea96..799e671c 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -82,7 +82,7 @@ public:
 		std::shared_ptr<const Asset> other,
 		EqualityOptions opt,
 		NoteHandler note
-		) const;
+		) const override;
 
 	/** @return number of channels */
 	int channels () const {
@@ -115,7 +115,7 @@ private:
 		boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate
 		);
 
-	std::string pkl_type (Standard standard) const {
+	std::string pkl_type (Standard standard) const override {
 		return static_pkl_type (standard);
 	}
 
diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index 0d7d2074..5157bc9f 100644
--- a/src/sound_asset_writer.cc
+++ b/src/sound_asset_writer.cc
@@ -38,14 +38,17 @@
 
 
 #include "bitstream.h"
-#include "sound_asset_writer.h"
-#include "sound_asset.h"
-#include "exceptions.h"
-#include "dcp_assert.h"
 #include "compose.hpp"
 #include "crypto_context.h"
+#include "dcp_assert.h"
+#include "exceptions.h"
+#include "sound_asset.h"
+#include "sound_asset_writer.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
 #include <asdcp/Metadata.h>
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 
@@ -136,11 +139,15 @@ SoundAssetWriter::start ()
 		if (field == MCASoundField::SEVEN_POINT_ONE) {
 			soundfield->MCATagSymbol = "sg71";
 			soundfield->MCATagName = "7.1DS";
+LIBDCP_DISABLE_WARNINGS
 			soundfield->MCALabelDictionaryID = asdcp_smpte_dict->ul(ASDCP::MDD_DCAudioSoundfield_71);
+LIBDCP_ENABLE_WARNINGS
 		} else {
 			soundfield->MCATagSymbol = "sg51";
 			soundfield->MCATagName = "5.1";
+LIBDCP_DISABLE_WARNINGS
 			soundfield->MCALabelDictionaryID = asdcp_smpte_dict->ul(ASDCP::MDD_DCAudioSoundfield_51);
+LIBDCP_ENABLE_WARNINGS
 		}
 
 		_state->mxf_writer.OP1aHeader().AddChildObject(soundfield);
@@ -167,7 +174,9 @@ SoundAssetWriter::start ()
 			if (auto lang = _asset->language()) {
 				channel->RFC5646SpokenLanguage = *lang;
 			}
+LIBDCP_DISABLE_WARNINGS
 			channel->MCALabelDictionaryID = channel_to_mca_universal_label(dcp_channel, field, asdcp_smpte_dict);
+LIBDCP_ENABLE_WARNINGS
 			_state->mxf_writer.OP1aHeader().AddChildObject(channel);
 			essence_descriptor->SubDescriptors.push_back(channel->InstanceUID);
 		}
diff --git a/src/sound_asset_writer.h b/src/sound_asset_writer.h
index b024749f..fde56d95 100644
--- a/src/sound_asset_writer.h
+++ b/src/sound_asset_writer.h
@@ -72,7 +72,7 @@ public:
 	 */
 	void write (float const * const *, int);
 
-	bool finalize ();
+	bool finalize () override;
 
 private:
 	friend class SoundAsset;
diff --git a/src/stereo_picture_asset_writer.h b/src/stereo_picture_asset_writer.h
index cf3e2a4e..0a361e41 100644
--- a/src/stereo_picture_asset_writer.h
+++ b/src/stereo_picture_asset_writer.h
@@ -64,9 +64,9 @@ public:
 	 *  @param data JPEG2000 data.
 	 *  @param size Size of data.
 	 */
-	FrameInfo write (uint8_t const * data, int size);
-	void fake_write (int size);
-	bool finalize ();
+	FrameInfo write (uint8_t const * data, int size) override;
+	void fake_write (int size) override;
+	bool finalize () override;
 
 private:
 	friend class StereoPictureAsset;
diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index c499b8fe..096c821a 100644
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -83,9 +83,9 @@ public:
 	public:
 		Part (std::shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Eye eye);
 
-		uint8_t const * data () const;
-		uint8_t * data ();
-		int size () const;
+		uint8_t const * data () const override;
+		uint8_t * data () override;
+		int size () const override;
 
 	private:
 		friend class StereoPictureFrame;
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 0afce3d0..2c542b6e 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -98,7 +98,7 @@ public:
 		std::shared_ptr<const Asset>,
 		EqualityOptions,
 		NoteHandler note
-		) const;
+		) const override;
 
 	std::vector<std::shared_ptr<const Subtitle>> subtitles_during (Time from, Time to, bool starting) const;
 	std::vector<std::shared_ptr<const Subtitle>> subtitles_in_reel(std::shared_ptr<const dcp::ReelAsset> asset) const;
diff --git a/src/subtitle_asset_internal.h b/src/subtitle_asset_internal.h
index c7037dcf..9b5bb2da 100644
--- a/src/subtitle_asset_internal.h
+++ b/src/subtitle_asset_internal.h
@@ -42,10 +42,13 @@
 
 
 #include "array_data.h"
+#include "dcp_time.h"
 #include "raw_convert.h"
 #include "types.h"
-#include "dcp_time.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 struct take_intersection_test;
@@ -131,7 +134,7 @@ public:
 		, text (text_)
 	{}
 
-	virtual xmlpp::Element* as_xml (xmlpp::Element* parent, Context &) const;
+	virtual xmlpp::Element* as_xml (xmlpp::Element* parent, Context &) const override;
 
 	std::string text;
 };
@@ -149,7 +152,7 @@ public:
 		, _direction (direction)
 	{}
 
-	xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const;
+	xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override;
 
 private:
 	HAlign _h_align;
@@ -171,7 +174,7 @@ public:
 		, _fade_down (fade_down)
 	{}
 
-	xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const;
+	xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override;
 
 private:
 	Time _in;
@@ -194,7 +197,7 @@ public:
 		, _v_position (v_position)
 	{}
 
-	xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const;
+	xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override;
 
 private:
 	ArrayData _png_data;
diff --git a/src/types.cc b/src/types.cc
index 743e7260..12be1b8a 100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -37,12 +37,15 @@
  */
 
 
-#include "raw_convert.h"
-#include "types.h"
-#include "exceptions.h"
 #include "compose.hpp"
 #include "dcp_assert.h"
+#include "exceptions.h"
+#include "raw_convert.h"
+#include "types.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <string>
 #include <vector>
diff --git a/src/types.h b/src/types.h
index 9dc3e5f5..e5f4ff7a 100644
--- a/src/types.h
+++ b/src/types.h
@@ -41,8 +41,11 @@
 #define LIBDCP_TYPES_H
 
 
+#include "warnings.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/KLV.h>
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 #include <boost/function.hpp>
 #include <string>
diff --git a/src/util.h b/src/util.h
index aa26bfaf..427ab427 100644
--- a/src/util.h
+++ b/src/util.h
@@ -42,13 +42,15 @@
 
 
 #include "array_data.h"
-#include "types.h"
 #include "local_time.h"
+#include "types.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/KM_log.h>
-#include <memory>
-#include <boost/function.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
+#include <boost/function.hpp>
 #include <boost/optional.hpp>
+#include <memory>
 #include <string>
 #include <stdint.h>
 
diff --git a/src/verify.cc b/src/verify.cc
index a2298f38..c9d9b24d 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -156,22 +156,22 @@ private:
 class DCPErrorHandler : public ErrorHandler
 {
 public:
-	void warning(const SAXParseException& e)
+	void warning(const SAXParseException& e) override
 	{
 		maybe_add (XMLValidationError(e));
 	}
 
-	void error(const SAXParseException& e)
+	void error(const SAXParseException& e) override
 	{
 		maybe_add (XMLValidationError(e));
 	}
 
-	void fatalError(const SAXParseException& e)
+	void fatalError(const SAXParseException& e) override
 	{
 		maybe_add (XMLValidationError(e));
 	}
 
-	void resetErrors() {
+	void resetErrors() override {
 		_errors.clear ();
 	}
 
@@ -246,7 +246,7 @@ public:
 		add("http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL", "SMPTE-429-10-2008.xsd");
 	}
 
-	InputSource* resolveEntity(XMLCh const *, XMLCh const * system_id)
+	InputSource* resolveEntity(XMLCh const *, XMLCh const * system_id) override
 	{
 		if (!system_id) {
 			return 0;