diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-29 13:12:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-29 13:12:41 (GMT) |
| commit | 4a6a27ad85a4be666a3bb4260105a54ba1cea0eb (patch) | |
| tree | 8e1248a1843097ef2b4275c22b80d6456eb36c43 /Source | |
| parent | 2b9086d26614787bbc47b8ee47514583f6814e5d (diff) | |
| parent | cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b (diff) | |
| download | CMake-4a6a27ad85a4be666a3bb4260105a54ba1cea0eb.zip CMake-4a6a27ad85a4be666a3bb4260105a54ba1cea0eb.tar.gz CMake-4a6a27ad85a4be666a3bb4260105a54ba1cea0eb.tar.bz2 | |
Merge topic 'update-kwsys'
cdd2875a Merge branch 'upstream-KWSys' into update-kwsys
e9c5505b KWSys 2017-03-28 (34999b6a)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !637
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/kwsys/FStream.hxx.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/FStream.hxx.in b/Source/kwsys/FStream.hxx.in index cf331a5..d4bc6c9 100644 --- a/Source/kwsys/FStream.hxx.in +++ b/Source/kwsys/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@_FStream_NOEXCEPT { close(); } |