diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-14 02:02:17 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-14 02:02:17 +0200 |
| commit | 96d6f783b7dfac04af8a7d77033a3d05e31cfc10 (patch) | |
| tree | 38c78bc2ab560401f20cd9cde7571f3edd5d6f44 /tools | |
| parent | e97157fd7fe6767fdc2b1fa32df5b821296907a9 (diff) | |
C++11 tidying.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/common.cc | 7 | ||||
| -rw-r--r-- | tools/dcpkdm.cc | 17 |
2 files changed, 16 insertions, 8 deletions
diff --git a/tools/common.cc b/tools/common.cc index 54bee6b5..13ce9cb0 100644 --- a/tools/common.cc +++ b/tools/common.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -31,13 +31,15 @@ files in the program, then also delete it here. */ + #include "common.h" #include "dcp.h" -using std::dynamic_pointer_cast; + using std::shared_ptr; using std::vector; + void dcp::filter_notes (vector<dcp::VerificationNote>& notes, bool ignore_missing_assets) { @@ -52,3 +54,4 @@ dcp::filter_notes (vector<dcp::VerificationNote>& notes, bool ignore_missing_ass notes = filtered; } + diff --git a/tools/dcpkdm.cc b/tools/dcpkdm.cc index a3e099ba..20b07ebc 100644 --- a/tools/dcpkdm.cc +++ b/tools/dcpkdm.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2019 Carl Hetherington <cth@carlh.net> + Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -31,18 +31,21 @@ files in the program, then also delete it here. */ -#include "encrypted_kdm.h" + +#include "certificate_chain.h" #include "decrypted_kdm.h" -#include "util.h" +#include "encrypted_kdm.h" #include "exceptions.h" -#include "certificate_chain.h" +#include "util.h" #include <getopt.h> -using std::string; -using std::cout; + using std::cerr; +using std::cout; +using std::string; using boost::optional; + static void help (string n) { @@ -51,6 +54,7 @@ help (string n) << " -p, --private-key private key file\n"; } + static string tm_to_string (struct tm t) { @@ -59,6 +63,7 @@ tm_to_string (struct tm t) return buffer; } + int main (int argc, char* argv[]) try |