From: Carl Hetherington <cth@carlh.net>
Date: Wed, 15 Aug 2018 11:38:00 +0000 (+0100)
Subject: Build fixes.
X-Git-Tag: v2.13.43~24^2~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d9561404372d187ea7813389ac69545de614f259

Build fixes.
---

diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index b4352dff4..d4b82d199 100644
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -48,7 +48,7 @@ GDCCertificatePanel::do_download ()
 		"ftp://%1:%2@ftp.gdc-tech.com/SHA256/A%3",
 		Config::instance()->gdc_username().get(),
 		Config::instance()->gdc_password().get(),
-		serial
+		wx_to_std(_serial->GetValue())
 		);
 
 	optional<string> error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
diff --git a/test/content_test.cc b/test/content_test.cc
index 31484c0d2..330bbdc94 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -123,6 +123,6 @@ BOOST_AUTO_TEST_CASE (content_test3)
 
 	/* Likewise position */
 
-	cout << to_string(content->position()) << " " << DCPTime::from_seconds(15.0 / 25.0) << "\n";
+	std::cout << to_string(content->position()) << " " << to_string(DCPTime::from_seconds(15.0 / 25.0)) << "\n";
 	BOOST_CHECK (content->position() == DCPTime::from_seconds (15.0 / 25.0));
 }