diff options
author | Brad King <brad.king@kitware.com> | 2016-12-05 14:55:34 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-12-05 14:55:34 (GMT) |
commit | 7f307d9ea6e77ee6fd7081d464314a64cbf64f32 (patch) | |
tree | a165c1c500907a74c6046dbbebcbbd68d4fda078 /Source/kwsys/testConsoleBufChild.cxx | |
parent | d59010e47fa953afb7f638fbab1a65195478d3fa (diff) | |
parent | 1b50bd3f5c1f608a84df89c2f5e187a53f0be31d (diff) | |
download | CMake-7f307d9ea6e77ee6fd7081d464314a64cbf64f32.zip CMake-7f307d9ea6e77ee6fd7081d464314a64cbf64f32.tar.gz CMake-7f307d9ea6e77ee6fd7081d464314a64cbf64f32.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-12-02 (4967ccc0)
Diffstat (limited to 'Source/kwsys/testConsoleBufChild.cxx')
-rw-r--r-- | Source/kwsys/testConsoleBufChild.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/kwsys/testConsoleBufChild.cxx b/Source/kwsys/testConsoleBufChild.cxx index 313323e..83bf545 100644 --- a/Source/kwsys/testConsoleBufChild.cxx +++ b/Source/kwsys/testConsoleBufChild.cxx @@ -28,7 +28,8 @@ int main(int argc, const char* argv[]) std::cout << argv[1] << std::endl; std::cerr << argv[1] << std::endl; } else { - std::string str = kwsys::Encoding::ToNarrow(UnicodeTestString); + std::string str = kwsys::Encoding::ToNarrow(std::wstring( + UnicodeTestString, sizeof(UnicodeTestString) / sizeof(wchar_t) - 1)); std::cout << str << std::endl; std::cerr << str << std::endl; } |