summaryrefslogtreecommitdiffstats
path: root/Source/cmcmd.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-10-06 11:16:02 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-10-06 11:17:09 (GMT)
commit7986103940d455afe0c6757ada0d908a084e448e (patch)
tree2595d7b570735ef4911607fa7ce56357be727cf2 /Source/cmcmd.cxx
parente67eb42fa1a9f5ffa2f1ae9307706ddf5ec696e2 (diff)
parentb32b717b69063698001c8c39737bcf690763c97c (diff)
downloadCMake-7986103940d455afe0c6757ada0d908a084e448e.zip
CMake-7986103940d455afe0c6757ada0d908a084e448e.tar.gz
CMake-7986103940d455afe0c6757ada0d908a084e448e.tar.bz2
Merge topic 'minor-fixes'
b32b717b cmInstallCommandArguments: do not access static members through `this` 7eaa964e cmProcessTools: fix minor issue introduced by 595feb3 85a7eaba cmGeneratorTarget: remove dead code 3345e2a2 cmcmd: let operator<< for NumberFormatter reset the stream's format flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1349
Diffstat (limited to 'Source/cmcmd.cxx')
-rw-r--r--Source/cmcmd.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index c0c7d03..ed507fd 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1556,11 +1556,13 @@ struct NumberFormatter
std::ostream& operator<<(std::ostream& stream,
NumberFormatter const& formatter)
{
+ auto const& flags = stream.flags();
if (formatter.Format == FORMAT_DECIMAL) {
- stream << formatter.Value;
+ stream << std::dec << formatter.Value;
} else {
stream << "0x" << std::hex << formatter.Value;
}
+ stream.flags(flags);
return stream;
}
static bool RunCommand(const char* comment, std::vector<std::string>& command,