From 422be0eece2bf6ee80db1d3c21553cd82efff789 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Jul 2016 10:06:10 +0100 Subject: Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream. --- src/tools/dcpomatic.cc | 2 +- src/tools/dcpomatic_kdm_cli.cc | 4 ++-- src/tools/dcpomatic_server.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tools') diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 88310ad3e..ac5b8a544 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -927,7 +927,7 @@ private: } for (size_t i = 0; i < history.size(); ++i) { - SafeStringStream s; + locked_stringstream s; if (i < 9) { s << "&" << (i + 1) << " "; } diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index df828416f..4c527ee0c 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -29,7 +29,7 @@ #include "lib/config.h" #include "lib/exceptions.h" #include "lib/emailer.h" -#include "lib/safe_stringstream.h" +#include #include #include #include @@ -82,7 +82,7 @@ time_from_string (string t) static boost::posix_time::time_duration duration_from_string (string d) { - SafeStringStream s (d); + locked_stringstream s (d); int N; string unit; s >> N >> unit; diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index a23e56ccd..08a04f35c 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -191,7 +191,7 @@ private: void update_state () { - SafeStringStream s; + locked_stringstream s; s << fixed << setprecision(1) << server_log->fps (); _fps->SetLabel (std_to_wx (s.str())); } -- cgit v1.2.3