[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-84-gab1addb

[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  ab1addb73d03889525a3c948501866bc2ffaacae (commit)
       via  6537189a8dfd967ad3541b0eac4351ba4e1ac4d5 (commit)
      from  5ec8861390616565e543ca00f596753a016959a5 (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=ab1addb73d03889525a3c948501866bc2ffaacae
commit ab1addb73d03889525a3c948501866bc2ffaacae
Merge: 5ec8861 6537189
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 14:39:04 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 14:39:04 2016 -0400

    Merge topic 'nmake-encoding' into next
    
    6537189a fixup! codecvt: Add class for encoding conversion


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

    fixup! codecvt: Add class for encoding conversion

diff --git a/Source/cm_codecvt.hxx b/Source/cm_codecvt.hxx
index 1473c67..4ef392d 100644
--- a/Source/cm_codecvt.hxx
+++ b/Source/cm_codecvt.hxx
@@ -3,7 +3,7 @@
 #ifndef cm_codecvt_hxx
 #define cm_codecvt_hxx
 
-#include <codecvt>
+#include <locale>
 #include <vector>
 
 class codecvt : public std::codecvt<char, char, mbstate_t>

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

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


hooks/post-receive
-- 
CMake