diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-03 00:04:31 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-03 23:31:24 +0200 |
| commit | a6fa1fb06fb6db8891c583260334870ef7c9d8c7 (patch) | |
| tree | 669b1e2bd6c36a47d046199e57ab2dce1e34a274 /src/lib | |
| parent | 6360c7be29ac0b1678d3887de081023932a60f68 (diff) | |
C++11 and whitespace cleanups.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 9 | ||||
| -rw-r--r-- | src/lib/dcp_examiner.cc | 1 | ||||
| -rw-r--r-- | src/lib/image_content.cc | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index df3d9ed1c..bcf3b9c76 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -55,15 +55,14 @@ #include "i18n.h" - -using std::list; using std::cout; +using std::dynamic_pointer_cast; +using std::list; +using std::make_shared; using std::map; +using std::shared_ptr; using std::string; using std::vector; -using std::shared_ptr; -using std::dynamic_pointer_cast; -using std::make_shared; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index f2ec68bdd..b1d278893 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -41,7 +41,6 @@ #include <dcp/reel_subtitle_asset.h> #include <dcp/search.h> #include <dcp/sound_asset.h> -#include <dcp/sound_asset.h> #include <dcp/sound_asset_reader.h> #include <dcp/stereo_picture_asset.h> #include <dcp/stereo_picture_asset_reader.h> diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 2dbb45581..05896dc07 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -19,6 +19,7 @@ */ + #include "compose.hpp" #include "exceptions.h" #include "film.h" |