[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-87-g7a68e30

[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  7a68e30bdc4baa0542cecd57fd963c18442d3719 (commit)
       via  69ba48d32de541c7d6b73bbd1dd3ed25f6ff0015 (commit)
       via  785ebd8a0b1ba20a45a5f29816e5742702955a10 (commit)
      from  ab1addb73d03889525a3c948501866bc2ffaacae (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=7a68e30bdc4baa0542cecd57fd963c18442d3719
commit 7a68e30bdc4baa0542cecd57fd963c18442d3719
Merge: ab1addb 69ba48d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 14:42:58 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 14:42:58 2016 -0400

    Merge topic 'nmake-encoding' into next
    
    69ba48d3 fixup! NMake: Use ANSI encoding for NMake Makefiles
    785ebd8a fixup! codecvt: Add class for encoding conversion


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69ba48d32de541c7d6b73bbd1dd3ed25f6ff0015
commit 69ba48d32de541c7d6b73bbd1dd3ed25f6ff0015
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 14:41:38 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 5 14:41:38 2016 -0400

    fixup! NMake: Use ANSI encoding for NMake Makefiles

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b16acfd..355bc56 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -64,7 +64,7 @@ public:
   /** Get encoding used by generator for makefile files */
   virtual codecvt::Encoding GetMakefileEncoding() const
   {
-    return codecvt::Encoding::None;
+    return codecvt::None;
   }
 
   /** Tell the generator about the target system.  */
diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h
index fea45ac..6eb2124 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.h
+++ b/Source/cmGlobalNMakeMakefileGenerator.h
@@ -29,7 +29,7 @@ public:
   /** Get encoding used by generator for makefile files */
   codecvt::Encoding GetMakefileEncoding() const CM_OVERRIDE
   {
-    return codecvt::Encoding::ANSI;
+    return codecvt::ANSI;
   }
 
   /** Get the documentation entry for this generator.  */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=785ebd8a0b1ba20a45a5f29816e5742702955a10
commit 785ebd8a0b1ba20a45a5f29816e5742702955a10
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 14:40:18 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 5 14:40:18 2016 -0400

    fixup! codecvt: Add class for encoding conversion

diff --git a/Source/cm_codecvt.cxx b/Source/cm_codecvt.cxx
index 72a6032..088f559 100644
--- a/Source/cm_codecvt.cxx
+++ b/Source/cm_codecvt.cxx
@@ -9,11 +9,11 @@
 #include <cmsys/Encoding.hxx>
 #endif
 
-codecvt::codecvt(Encoding encoding)
+codecvt::codecvt(Encoding e)
   : m_codepage(0)
   , m_lastState(0)
 {
-  switch (encoding) {
+  switch (e) {
     case codecvt::ANSI:
 #if defined(_WIN32)
       m_noconv = false;
diff --git a/Source/cm_codecvt.hxx b/Source/cm_codecvt.hxx
index 4ef392d..6bd0a78 100644
--- a/Source/cm_codecvt.hxx
+++ b/Source/cm_codecvt.hxx
@@ -18,7 +18,7 @@ public:
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
 
-  codecvt(Encoding encoding);
+  codecvt(Encoding e);
 
 protected:
   virtual ~codecvt();

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

Summary of changes:
 Source/cmGlobalGenerator.h              |    2 +-
 Source/cmGlobalNMakeMakefileGenerator.h |    2 +-
 Source/cm_codecvt.cxx                   |    4 ++--
 Source/cm_codecvt.hxx                   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake