summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-02-12 00:17:33 +0000
committerCarl Hetherington <cth@carlh.net>2019-02-12 00:17:33 +0000
commit6f856af55898f94b45e3be28aa4f7c962de8a398 (patch)
tree9bceb59ca98d592c886589c5491314530cf06b16 /src/lib
parent394c8347d54057c8a52dd63704ae2c9791bb30aa (diff)
Try to fix some warnings.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/content.cc2
-rw-r--r--src/lib/dcp_content.cc15
-rw-r--r--src/lib/util.cc2
3 files changed, 9 insertions, 10 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc
index b288580cb..ca76b01a6 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -205,7 +205,7 @@ Content::signal_change (ChangeType c, int p)
} else {
emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent));
}
- } catch (boost::bad_weak_ptr) {
+ } catch (boost::bad_weak_ptr &) {
/* This must be during construction; never mind */
}
}
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 469021d96..4c4486a28 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -547,10 +547,10 @@ DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_pt
list<DCPTimePeriod> reel_list;
try {
reel_list = reels (film);
- } catch (dcp::DCPReadError) {
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP; it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
@@ -625,13 +625,13 @@ DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) c
shared_ptr<DCPDecoder> decoder;
try {
decoder.reset (new DCPDecoder (film, shared_from_this(), false));
- } catch (dcp::DCPReadError) {
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (DCPError) {
+ } catch (DCPError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
@@ -660,11 +660,10 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
shared_ptr<DCPDecoder> decoder;
try {
decoder.reset (new DCPDecoder (film, shared_from_this(), false));
- } catch (dcp::DCPReadError) {
-
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 544045bcb..0b6f4be72 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -726,7 +726,7 @@ relaxed_string_to_float (string s)
try {
boost::algorithm::replace_all (s, ",", ".");
return lexical_cast<float> (s);
- } catch (bad_lexical_cast) {
+ } catch (bad_lexical_cast &) {
boost::algorithm::replace_all (s, ".", ",");
return lexical_cast<float> (s);
}