diff options
author | Brad King <brad.king@kitware.com> | 2017-03-28 14:18:10 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-03-28 14:18:10 (GMT) |
commit | cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b (patch) | |
tree | 06524f5f661d2e6d01c97a5e47d1af74bee0f7c7 /Source | |
parent | cc4fbda1a9fffd8927de870643f167f066b26bcd (diff) | |
parent | e9c5505bf9c51c34dea703b86a293ff04475db54 (diff) | |
download | CMake-cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b.zip CMake-cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b.tar.gz CMake-cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-03-28 (34999b6a)
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(); } |