[Cmake-commits] CMake branch, next, updated. v3.6.1-1280-g2b71053

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2b7105307a5d47cf29bf03d1d1bcc21b16b476bd (commit)
       via  10792e106aac2e5e3675c96b943818541620aa7c (commit)
      from  662661b2b462946f8ba6c82af22f014a18619756 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b7105307a5d47cf29bf03d1d1bcc21b16b476bd
commit 2b7105307a5d47cf29bf03d1d1bcc21b16b476bd
Merge: 662661b 10792e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 17 09:02:52 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 17 09:02:52 2016 -0400

    Merge topic 'process-output-encoding' into next
    
    10792e10 fixup! Windows: Encode child process output to internally-used encoding


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10792e106aac2e5e3675c96b943818541620aa7c
commit 10792e106aac2e5e3675c96b943818541620aa7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 17 08:57:15 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 17 08:57:15 2016 -0400

    fixup! Windows: Encode child process output to internally-used encoding

diff --git a/Source/cmProcessOutput.hxx b/Source/cmProcessOutput.hxx
index c896720..daffad1 100644
--- a/Source/cmProcessOutput.hxx
+++ b/Source/cmProcessOutput.hxx
@@ -31,10 +31,10 @@ public:
                   size_t id = 0);
 
 private:
+#if defined(_WIN32)
   unsigned int codepage;
   unsigned int bufferSize;
   std::vector<std::string> rawparts;
-#if defined(_WIN32)
   bool DoDecodeText(std::string raw, std::string& decoded, wchar_t* lastChar);
 #endif
 };

-----------------------------------------------------------------------

Summary of changes:
 Source/cmProcessOutput.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake