diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
| commit | 0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6 (patch) | |
| tree | 075a7a604bbd4e072ec1b07481d4eb82ed7ffd34 /src/lib/compose.hpp | |
| parent | 42a122334d594b824c666e5263168386a76801cc (diff) | |
| parent | 016a98b18d01276a1e603885a25785e7389f14d9 (diff) | |
Merge branch 'master' into 12bit
Diffstat (limited to 'src/lib/compose.hpp')
| -rw-r--r-- | src/lib/compose.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/compose.hpp b/src/lib/compose.hpp index b3f410c8e..aa67b5a1f 100644 --- a/src/lib/compose.hpp +++ b/src/lib/compose.hpp @@ -33,10 +33,10 @@ #ifndef STRING_COMPOSE_H #define STRING_COMPOSE_H -#include <sstream> #include <string> #include <list> #include <map> // for multimap +#include "safe_stringstream.h" namespace StringPrivate { @@ -56,7 +56,7 @@ namespace StringPrivate std::string str() const; private: - std::ostringstream os; + SafeStringStream os; int arg_no; // we store the output as a list - when the output string is requested, the |