summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bitstream.h2
-rw-r--r--src/language_tag.cc2
-rw-r--r--src/mono_picture_asset.cc4
-rw-r--r--src/types.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/bitstream.h b/src/bitstream.h
index 2dc7c20e..1afad17c 100644
--- a/src/bitstream.h
+++ b/src/bitstream.h
@@ -61,7 +61,7 @@ public:
private:
std::vector<bool> _data;
- boost::optional<boost::crc_basic<16> > _crc;
+ boost::optional<boost::crc_basic<16>> _crc;
};
diff --git a/src/language_tag.cc b/src/language_tag.cc
index 5e2c5a8b..8520a571 100644
--- a/src/language_tag.cc
+++ b/src/language_tag.cc
@@ -388,7 +388,7 @@ dcp::operator<< (ostream& os, dcp::LanguageTag const& tag)
}
-vector<pair<LanguageTag::SubtagType, LanguageTag::SubtagData> >
+vector<pair<LanguageTag::SubtagType, LanguageTag::SubtagData>>
LanguageTag::subtags () const
{
vector<pair<SubtagType, SubtagData>> s;
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 78ab8709..5aba95d2 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -94,7 +94,7 @@ MonoPictureAsset::MonoPictureAsset (Fraction edit_rate, Standard standard)
static void
-storing_note_handler (list<pair<NoteType, string> >& notes, NoteType t, string s)
+storing_note_handler (list<pair<NoteType, string>>& notes, NoteType t, string s)
{
notes.push_back (make_pair (t, s));
}
@@ -156,7 +156,7 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
auto frame_A = reader->get_frame (i);
auto frame_B = other_reader->get_frame (i);
- list<pair<NoteType, string> > notes;
+ list<pair<NoteType, string>> notes;
if (!frame_buffer_equals (
i, opt, bind (&storing_note_handler, boost::ref(notes), _1, _2),
diff --git a/src/types.h b/src/types.h
index e5f4ff7a..caa28dd5 100644
--- a/src/types.h
+++ b/src/types.h
@@ -484,7 +484,7 @@ public:
private:
MCASoundField _field;
- std::vector<boost::optional<Channel> > _channels;
+ std::vector<boost::optional<Channel>> _channels;
};