diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-26 01:37:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-26 01:37:00 +0100 |
| commit | 0a1b4c69c23d6e4838707fe74f3a55aa7b6c8649 (patch) | |
| tree | c40c3e9f8ac8157797d5527db8d836a90eb4dc23 /src/util.cc | |
| parent | 2739fd197482fbc355de60907ca07cb614051e40 (diff) | |
| parent | d848eed414a5d5c8bc35a3ec843f01e8b609f60d (diff) | |
Merge branch '1.0' of git.carlh.net:git/libsub into 1.0
Diffstat (limited to 'src/util.cc')
| -rw-r--r-- | src/util.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/util.cc b/src/util.cc index a165126..66490c1 100644 --- a/src/util.cc +++ b/src/util.cc @@ -20,6 +20,7 @@ #include "util.h" #include <string> #include <sstream> +#include <iostream> #include <cstdio> using std::string; @@ -45,12 +46,12 @@ sub::empty_or_white_space (string s) optional<string> sub::get_line_stringstream (stringstream* str) { - string s; - getline (*str, s); if (!str->good ()) { return optional<string> (); } + string s; + getline (*str, s); return s; } |