Cleanup: fix more comments/guards (and add check script).

[libdcp.git] / src / reel_closed_caption_asset.cc

diff --git a/src/reel_closed_caption_asset.cc b/src/reel_closed_caption_asset.cc
index 3e4627d3eb3989eb89d0275742525bdcbeed43c2..e5649d6a407b3b331909c0ea33bf403d84852d6a 100644 (file)
--- a/src/reel_closed_caption_asset.cc
+++ b/src/reel_closed_caption_asset.cc
@@ -37,19 +37,19 @@
  */
 
 
-#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;
-using std::pair;
-using std::make_pair;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
-using boost::optional;
 using namespace dcp;
 
 
@@ -75,7 +75,7 @@ ReelClosedCaptionAsset::ReelClosedCaptionAsset (std::shared_ptr<const cxml::Node
 
 
 bool
-ReelClosedCaptionAsset::equals (shared_ptr<const ReelClosedCaptionAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelClosedCaptionAsset::equals(shared_ptr<const ReelClosedCaptionAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals (other, opt, note)) {
                return false;