diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-15 12:38:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-15 12:38:00 +0100 |
| commit | d9561404372d187ea7813389ac69545de614f259 (patch) | |
| tree | d6cfbfa812adb3f4559f702bcfdd39541966db9b | |
| parent | 968899937f96a7f72d4acce788da6b701db3a74c (diff) | |
Build fixes.
| -rw-r--r-- | src/wx/gdc_certificate_panel.cc | 2 | ||||
| -rw-r--r-- | test/content_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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)); } |