diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-06-26 00:00:38 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-06-26 00:00:38 +0200 |
| commit | e97157fd7fe6767fdc2b1fa32df5b821296907a9 (patch) | |
| tree | 8a503fdf7e5958bdbb3db8e98fc7d1fd313e63ad | |
| parent | 97b4901435e1ffc59d347cf7478a31fea8fae3a3 (diff) | |
C++11 cleanup.
| -rw-r--r-- | src/bitstream.h | 2 | ||||
| -rw-r--r-- | src/language_tag.cc | 2 | ||||
| -rw-r--r-- | src/mono_picture_asset.cc | 4 | ||||
| -rw-r--r-- | src/types.h | 2 | ||||
| -rw-r--r-- | test/combine_test.cc | 2 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 2 |
6 files changed, 7 insertions, 7 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; }; diff --git a/test/combine_test.cc b/test/combine_test.cc index e1512e41..603cca62 100644 --- a/test/combine_test.cc +++ b/test/combine_test.cc @@ -97,7 +97,7 @@ check_no_errors (boost::filesystem::path path) template <class T> shared_ptr<T> -pointer_to_id_in_vector (shared_ptr<T> needle, vector<shared_ptr<T> > haystack) +pointer_to_id_in_vector (shared_ptr<T> needle, vector<shared_ptr<T>> haystack) { for (auto i: haystack) { if (i->id() == needle->id()) { diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index c8519858..46b506fa 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -359,7 +359,7 @@ main (int argc, char* argv[]) only = boost::split(only, *only_string, boost::is_any_of(",")); } - vector<shared_ptr<CPL> > cpls; + vector<shared_ptr<CPL>> cpls; if (boost::filesystem::is_directory(argv[optind])) { DCP* dcp = 0; vector<dcp::VerificationNote> notes; |