[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-89-g003dceb

[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  003dceb9f5b416a41ba9ca38c51f24f82e867091 (commit)
       via  1c165e6148dda9e40fe17b6f39bf4c96e3c2fc96 (commit)
      from  7a68e30bdc4baa0542cecd57fd963c18442d3719 (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=003dceb9f5b416a41ba9ca38c51f24f82e867091
commit 003dceb9f5b416a41ba9ca38c51f24f82e867091
Merge: 7a68e30 1c165e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 15:04:24 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 15:04:24 2016 -0400

    Merge topic 'nmake-encoding' into next
    
    1c165e61 fixup! cmGeneratedFileStream: Add optional encoding support


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c165e6148dda9e40fe17b6f39bf4c96e3c2fc96
commit 1c165e6148dda9e40fe17b6f39bf4c96e3c2fc96
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 15:04:13 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 5 15:04:13 2016 -0400

    fixup! cmGeneratedFileStream: Add optional encoding support

diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx
index cd796cd..6cdb7f5 100644
--- a/Source/cmGeneratedFileStream.cxx
+++ b/Source/cmGeneratedFileStream.cxx
@@ -15,7 +15,7 @@ cmGeneratedFileStream::cmGeneratedFileStream(Encoding encoding)
   , Stream()
 {
 #ifdef CMAKE_BUILD_WITH_CMAKE
-  if (encoding != Encoding::None) {
+  if (encoding != codecvt::None) {
     imbue(std::locale(getloc(), new codecvt(encoding)));
   }
 #else
@@ -35,7 +35,7 @@ cmGeneratedFileStream::cmGeneratedFileStream(const char* name, bool quiet,
     cmSystemTools::ReportLastSystemError("");
   }
 #ifdef CMAKE_BUILD_WITH_CMAKE
-  if (encoding != Encoding::None) {
+  if (encoding != codecvt::None) {
     imbue(std::locale(getloc(), new codecvt(encoding)));
   }
 #else
diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h
index 6cdebc6..a027b01 100644
--- a/Source/cmGeneratedFileStream.h
+++ b/Source/cmGeneratedFileStream.h
@@ -78,7 +78,7 @@ public:
    * This constructor prepares a default stream.  The open method must
    * be used before writing to the stream.
    */
-  cmGeneratedFileStream(Encoding encoding = Encoding::None);
+  cmGeneratedFileStream(Encoding encoding = codecvt::None);
 
   /**
    * This constructor takes the name of the file to be generated.  It
@@ -87,7 +87,7 @@ public:
    * second argument is set to true.
    */
   cmGeneratedFileStream(const char* name, bool quiet = false,
-                        Encoding encoding = Encoding::None);
+                        Encoding encoding = codecvt::None);
 
   /**
    * The destructor checks the stream status to be sure the temporary

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

Summary of changes:
 Source/cmGeneratedFileStream.cxx |    4 ++--
 Source/cmGeneratedFileStream.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake