summaryrefslogtreecommitdiff
path: root/src/key.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-28 16:43:28 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-28 16:43:28 +0100
commite4d5298e7a179d4103581cba05cbc516f94acf60 (patch)
tree0b9c8cb6ad65917f6a3bf76f5a55ec648bdb0e42 /src/key.cc
parent5eb63969c5b6f26ea820cfab116d4aecb6bd3390 (diff)
parentdc52dfc8e5a5e89005098bbec56331f9f0c6d3aa (diff)
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
Diffstat (limited to 'src/key.cc')
-rw-r--r--src/key.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/key.cc b/src/key.cc
index d2417a09..cf7b4d6d 100644
--- a/src/key.cc
+++ b/src/key.cc
@@ -36,15 +36,14 @@
*/
#include "key.h"
+#include <locked_sstream.h>
#include <asdcp/AS_DCP.h>
#include <asdcp/KM_prng.h>
#include <asdcp/KM_util.h>
-#include <sstream>
#include <string>
#include <iomanip>
using std::string;
-using std::stringstream;
using std::setw;
using std::setfill;
using namespace dcp;
@@ -94,7 +93,7 @@ Key::operator= (Key const & other)
string
Key::hex () const
{
- stringstream g;
+ locked_stringstream g;
for (unsigned int i = 0; i < ASDCP::KeyLen; ++i) {
g << setw(2) << setfill('0') << std::hex << static_cast<int> (_value[i]);