[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-600-g3b32fdc

[Kitware Robot]

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
  discards  645fc9b377931fb0df4360eb7a8dff2073394b6b (commit)
  discards  98486d17f2a925510c8bd3245942f1227c4fbe4c (commit)
       via  3b32fdc5d1530368b5b05d009f59bca79759d1c1 (commit)
       via  cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b (commit)
       via  e9c5505bf9c51c34dea703b86a293ff04475db54 (commit)
       via  cc4fbda1a9fffd8927de870643f167f066b26bcd (commit)
       via  3d3eacbb6115f39ba40f8c2fa48f9cf84ba210e9 (commit)
       via  83199f8daf13328a4fb97c16476c3a0da4228ead (commit)
       via  85abc5f5aa5f8afbca88e7b3e1c919db49756ecb (commit)
       via  8c94f5085d24bbc25f3f7fa421f7a62761a5515c (commit)
       via  3ed87b7ee1038f11e7d86988aca692c0773209b6 (commit)
       via  16cd8600683a0e144f31a2e2551013283458f231 (commit)
       via  2b350775d212835a39cf541bbb46aec0a7bf52cf (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (645fc9b377931fb0df4360eb7a8dff2073394b6b)
            \
             N -- N -- N (3b32fdc5d1530368b5b05d009f59bca79759d1c1)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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=3b32fdc5d1530368b5b05d009f59bca79759d1c1
commit 3b32fdc5d1530368b5b05d009f59bca79759d1c1
Merge: cc4fbda cdd2875
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 28 14:19:54 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 28 10:19:56 2017 -0400

    Stage topic 'update-kwsys'
    
    Topic-id: 23322
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/637


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b
commit cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b
Merge: cc4fbda e9c5505
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 28 10:18:10 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 28 10:18:10 2017 -0400

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2017-03-28 (34999b6a)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9c5505bf9c51c34dea703b86a293ff04475db54
commit e9c5505bf9c51c34dea703b86a293ff04475db54
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Tue Mar 28 09:49:59 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 28 10:18:09 2017 -0400

    KWSys 2017-03-28 (34999b6a)
    
    Code extracted from:
    
        https://gitlab.kitware.com/utils/kwsys.git
    
    at commit 34999b6ab815d1456818f4517338a15be7f89ea0 (master).
    
    Upstream Shortlog
    -----------------
    
    Daniel Pfeifer (1):
          6f43bcef FStream: Make (i|o)fstream::is_open function public

diff --git a/FStream.hxx.in b/FStream.hxx.in
index cf331a5..d4bc6c9 100644
--- a/FStream.hxx.in
+++ b/FStream.hxx.in
@@ -170,8 +170,6 @@ template <typename CharType, typename Traits = std::char_traits<CharType> >
 class basic_ifstream : public std::basic_istream<CharType, Traits>,
                        public basic_efilebuf<CharType, Traits>
 {
-  using basic_efilebuf<CharType, Traits>::is_open;
-
 public:
   typedef typename basic_efilebuf<CharType, Traits>::internal_buffer_type
     internal_buffer_type;
@@ -201,6 +199,8 @@ public:
 
   void close() { this->_set_state(this->_close(), this, this); }
 
+  using basic_efilebuf<CharType, Traits>::is_open;
+
   internal_buffer_type* rdbuf() const { return this->buf_; }
 
   ~basic_ifstream() @KWSYS_NAMESPACE at _FStream_NOEXCEPT { close(); }

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

Summary of changes:
 Source/kwsys/FStream.hxx.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake