[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-990-g32d0a8a
Brad King
brad.king at kitware.com
Wed Nov 9 09:22:48 EST 2016
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 32d0a8a1ac3254ea029bee283358d782f0609414 (commit)
via d2c565f6f707e94cf0e77261033e72ffbd3b2109 (commit)
via 966a7e290c81308ef6185d18de6bcc11e43643d3 (commit)
from 807ac5d9a3ab9ea13f8b918347cff1c18aebe66c (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=32d0a8a1ac3254ea029bee283358d782f0609414
commit 32d0a8a1ac3254ea029bee283358d782f0609414
Merge: 807ac5d d2c565f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 9 09:22:47 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 9 09:22:47 2016 -0500
Merge topic 'update-kwsys' into next
d2c565f6 Merge branch 'upstream-KWSys' into update-kwsys
966a7e29 KWSys 2016-11-09 (18c65411)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2c565f6f707e94cf0e77261033e72ffbd3b2109
commit d2c565f6f707e94cf0e77261033e72ffbd3b2109
Merge: 35c6358 966a7e2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 9 09:22:28 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 9 09:22:28 2016 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-11-09 (18c65411)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=966a7e290c81308ef6185d18de6bcc11e43643d3
commit 966a7e290c81308ef6185d18de6bcc11e43643d3
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Wed Nov 9 09:12:29 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 9 09:22:13 2016 -0500
KWSys 2016-11-09 (18c65411)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 18c654114de3aa65429542f95308720bc68f9231 (master).
Upstream Shortlog
-----------------
Brad King (1):
18c65411 FStream: Include Configure.hxx before other headers
diff --git a/FStream.hxx.in b/FStream.hxx.in
index 4db81a4..736214f 100644
--- a/FStream.hxx.in
+++ b/FStream.hxx.in
@@ -3,9 +3,11 @@
#ifndef @KWSYS_NAMESPACE at _FStream_hxx
#define @KWSYS_NAMESPACE at _FStream_hxx
-#include <fstream>
#include <@KWSYS_NAMESPACE@/Configure.hxx>
+
#include <@KWSYS_NAMESPACE@/Encoding.hxx>
+
+#include <fstream>
#if defined(_WIN32)
#if !defined(_MSC_VER) && @KWSYS_NAMESPACE at _CXX_HAS_EXT_STDIO_FILEBUF_H
#include <ext/stdio_filebuf.h>
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/FStream.hxx.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list