Various fix-ups and warning fixes from OS X.

5 files changed, 7 insertions, 6 deletions

diff --git a/src/mxf.cc b/src/mxf.cc
index f5282f1c..f4d4a490 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -92,7 +92,7 @@ MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, Standard standard)
 }
 
 bool
-MXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+MXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
 	if (!Content::equals (other, opt, note)) {
 		return false;
diff --git a/src/mxf.h b/src/mxf.h
index 6985342b..f7b94bd2 100644
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -50,7 +50,7 @@ public:
 	~MXF ();
 
 	bool equals (
-		boost::shared_ptr<const Content> other,
+		boost::shared_ptr<const Asset> other,
 		EqualityOptions opt,
 		boost::function<void (NoteType, std::string)> note
 		) const;
diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index 4c93b629..0c7c6e51 100644
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -76,9 +76,9 @@ ReelAsset::ReelAsset (shared_ptr<const cxml::Node> node)
 }
 
 void
-ReelAsset::write_to_cpl (xmlpp::Node* node, Standard) const
+ReelAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-        pair<string, string> const attr = cpl_node_attribute ();
+        pair<string, string> const attr = cpl_node_attribute (standard);
         xmlpp::Element* a = node->add_child (cpl_node_name ());
         if (!attr.first.empty ()) {
                 a->set_attribute (attr.first, attr.second);
@@ -93,7 +93,7 @@ ReelAsset::write_to_cpl (xmlpp::Node* node, Standard) const
 }
 
 pair<string, string>
-ReelAsset::cpl_node_attribute () const
+ReelAsset::cpl_node_attribute (Standard) const
 {
 	return make_pair ("", "");
 }
diff --git a/src/reel_asset.h b/src/reel_asset.h
index 93f6fe91..84d98221 100644
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -84,7 +84,7 @@ protected:
 	/** @return Any attribute that should be used on the asset's node in the
 	 *  CPL.
 	 */
-	virtual std::pair<std::string, std::string> cpl_node_attribute () const;
+	virtual std::pair<std::string, std::string> cpl_node_attribute (Standard) const;
 
 	/** Reference to the content (MXF or XML file) that this reel entry
 	 *  applies to.
diff --git a/src/signer.cc b/src/signer.cc
index d9c46145..0dca8f21 100644
--- a/src/signer.cc
+++ b/src/signer.cc
@@ -31,6 +31,7 @@
 #include <xmlsec/dl.h>
 #include <xmlsec/app.h>
 #include <xmlsec/crypto.h>
+#include <openssl/pem.h>
 #include "compose.hpp"
 
 using std::string;