diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-10 12:43:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-10 12:43:41 (GMT) |
| commit | f1a4ecdc0c62b46c90df5e8d20e6f61d06063894 (patch) | |
| tree | 405aa77560c8a6855cdda3e6e63b5fa0b4e04af7 /Source/kwsys/testEncoding.cxx | |
| parent | c798dc8573a205f90663e9983b793b21fea28521 (diff) | |
| parent | c551ff588b48cc4c286922779651890da0f3c22c (diff) | |
| download | CMake-f1a4ecdc0c62b46c90df5e8d20e6f61d06063894.zip CMake-f1a4ecdc0c62b46c90df5e8d20e6f61d06063894.tar.gz CMake-f1a4ecdc0c62b46c90df5e8d20e6f61d06063894.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-10-10 (239bc737)
Diffstat (limited to 'Source/kwsys/testEncoding.cxx')
| -rw-r--r-- | Source/kwsys/testEncoding.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/kwsys/testEncoding.cxx b/Source/kwsys/testEncoding.cxx index 2c5ef46..2742fe4 100644 --- a/Source/kwsys/testEncoding.cxx +++ b/Source/kwsys/testEncoding.cxx @@ -75,6 +75,10 @@ static int testRobustEncoding() // test that the conversion functions handle invalid // unicode correctly/gracefully + // we manipulate the format flags of stdout, remember + // the original state here to restore before return + std::ios::fmtflags const& flags = std::cout.flags(); + int ret = 0; char cstr[] = { (char)-1, 0 }; // this conversion could fail @@ -120,6 +124,7 @@ static int testRobustEncoding() ret++; } + std::cout.flags(flags); return ret; } |