summaryrefslogtreecommitdiff
path: root/src/lib/update.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-16 16:30:11 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-16 16:30:11 +0100
commit0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6 (patch)
tree075a7a604bbd4e072ec1b07481d4eb82ed7ffd34 /src/lib/update.cc
parent42a122334d594b824c666e5263168386a76801cc (diff)
parent016a98b18d01276a1e603885a25785e7389f14d9 (diff)
Merge branch 'master' into 12bit
Diffstat (limited to 'src/lib/update.cc')
-rw-r--r--src/lib/update.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/update.cc b/src/lib/update.cc
index af3e46f0e..7bec061e9 100644
--- a/src/lib/update.cc
+++ b/src/lib/update.cc
@@ -18,7 +18,6 @@
*/
#include <string>
-#include <sstream>
#include <boost/algorithm/string.hpp>
#include <curl/curl.h>
#include <libcxml/cxml.h>
@@ -26,13 +25,13 @@
#include "update.h"
#include "version.h"
#include "ui_signaller.h"
+#include "safe_stringstream.h"
#define BUFFER_SIZE 1024
using std::cout;
using std::min;
using std::string;
-using std::stringstream;
using libdcp::raw_convert;
UpdateChecker* UpdateChecker::_instance = 0;
@@ -103,10 +102,9 @@ UpdateChecker::thread ()
}
_buffer[_offset] = '\0';
- stringstream s;
- s << _buffer;
+ string s (_buffer);
cxml::Document doc ("Update");
- doc.read_stream (s);
+ doc.read_string (s);
{
boost::mutex::scoped_lock lm (_data_mutex);