diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2015-01-20 16:00:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-21 14:15:40 (GMT) |
| commit | 77444a7d486c415508a9c754fd4cc29cbb33f12f (patch) | |
| tree | 48c00726fb739403e5d5a963b1a9f85514067cfc /FStream.hxx.in | |
| parent | 54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3 (diff) | |
| download | CMake-77444a7d486c415508a9c754fd4cc29cbb33f12f.zip CMake-77444a7d486c415508a9c754fd4cc29cbb33f12f.tar.gz CMake-77444a7d486c415508a9c754fd4cc29cbb33f12f.tar.bz2 | |
KWSys 2015-01-20 (b33e7b96)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ b33e7b96 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 425fa73e..b33e7b96
Brad King (2):
57c3ef1d Suppress deprecation warnings for GetVersionEx on Intel compiler
b33e7b96 FStream: Fix exception spec on our standard stream replacements
Change-Id: I69044c5879a1ec4a5be59bdda05540c1eb65b197
Diffstat (limited to 'FStream.hxx.in')
| -rw-r--r-- | FStream.hxx.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/FStream.hxx.in b/FStream.hxx.in index 45425ff..37055d6 100644 --- a/FStream.hxx.in +++ b/FStream.hxx.in @@ -18,6 +18,11 @@ namespace @KWSYS_NAMESPACE@ { #if defined(_MSC_VER) && _MSC_VER >= 1400 +# if defined(_NOEXCEPT) +# define @KWSYS_NAMESPACE@_FStream_NOEXCEPT _NOEXCEPT +# else +# define @KWSYS_NAMESPACE@_FStream_NOEXCEPT +# endif template<typename CharType,typename Traits> class basic_filebuf : public std::basic_filebuf<CharType,Traits> { @@ -85,7 +90,7 @@ namespace @KWSYS_NAMESPACE@ return buf_; } - ~basic_ifstream() + ~basic_ifstream() @KWSYS_NAMESPACE@_FStream_NOEXCEPT { buf_->close(); delete buf_; @@ -147,7 +152,7 @@ class basic_ofstream : public std::basic_ostream<CharType,Traits> { return buf_.get(); } - ~basic_ofstream() + ~basic_ofstream() @KWSYS_NAMESPACE@_FStream_NOEXCEPT { buf_->close(); delete buf_; @@ -160,6 +165,7 @@ class basic_ofstream : public std::basic_ostream<CharType,Traits> typedef basic_ifstream<char> ifstream; typedef basic_ofstream<char> ofstream; +# undef @KWSYS_NAMESPACE@_FStream_NOEXCEPT #else using @KWSYS_NAMESPACE@_ios_namespace::ofstream; using @KWSYS_NAMESPACE@_ios_namespace::ifstream; |