From e97157fd7fe6767fdc2b1fa32df5b821296907a9 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 26 Jun 2021 00:00:38 +0200
Subject: C++11 cleanup.

---
 src/bitstream.h           | 2 +-
 src/language_tag.cc       | 2 +-
 src/mono_picture_asset.cc | 4 ++--
 src/types.h               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

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;
 };
 
 
-- 
cgit v1.2.3