diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /src/tools | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 1 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_server_cli.cc | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 8c7f09ae7..424645537 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -65,7 +65,6 @@ using std::cout; using std::string; using std::wstring; -using std::stringstream; using std::map; using std::make_pair; using std::list; diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index f9ed15544..6257d60af 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -24,9 +24,9 @@ #include "lib/kdm.h" #include "lib/config.h" #include "lib/exceptions.h" +#include "lib/safe_stringstream.h" using std::string; -using std::stringstream; using std::cout; using std::cerr; using std::list; @@ -76,7 +76,7 @@ time_from_string (string t) static boost::posix_time::time_duration duration_from_string (string d) { - stringstream s (d); + SafeStringStream s (d); int N; string unit; s >> N >> unit; diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index c74e258e8..b816460a3 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -20,7 +20,6 @@ #include "lib/server.h" #include <iostream> #include <stdexcept> -#include <sstream> #include <cstring> #include <vector> #include <unistd.h> |