Build fixes.

diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index b4352dff4ef70c1c6d559b32017a435967aeac48..d4b82d19986102d3fc551471d1713060179044c8 100644 (file)
--- 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 31484c0d234c676afcd261f9f23ac896466e9085..330bbdc9462a3094d45253816859ab0698651ed6 100644 (file)
--- 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));
 }