kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-kwsys' into update-kwsys

This commit is contained in:
Brad King 2015-01-21 09:15:44 -05:00
parent f709776864 77444a7d48
commit 7e468cd8f9
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/kwsys/FStream.hxx.in
View File

@ -18,6 +18,11 @@
namespace @KWSYS_NAMESPACE@ namespace @KWSYS_NAMESPACE@
{ {
#if defined(_MSC_VER) && _MSC_VER >= 1400 #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> template<typename CharType,typename Traits>
class basic_filebuf : public std::basic_filebuf<CharType,Traits> class basic_filebuf : public std::basic_filebuf<CharType,Traits>
{ {
@ -85,7 +90,7 @@ namespace @KWSYS_NAMESPACE@
return buf_; return buf_;
} }
~basic_ifstream() ~basic_ifstream() @KWSYS_NAMESPACE@_FStream_NOEXCEPT
{ {
buf_->close(); buf_->close();
delete buf_; delete buf_;
@ -147,7 +152,7 @@ class basic_ofstream : public std::basic_ostream<CharType,Traits>
{ {
return buf_.get(); return buf_.get();
} }
~basic_ofstream() ~basic_ofstream() @KWSYS_NAMESPACE@_FStream_NOEXCEPT
{ {
buf_->close(); buf_->close();
delete buf_; delete buf_;
@ -160,6 +165,7 @@ class basic_ofstream : public std::basic_ostream<CharType,Traits>
typedef basic_ifstream<char> ifstream; typedef basic_ifstream<char> ifstream;
typedef basic_ofstream<char> ofstream; typedef basic_ofstream<char> ofstream;
# undef @KWSYS_NAMESPACE@_FStream_NOEXCEPT
#else #else
using @KWSYS_NAMESPACE@_ios_namespace::ofstream; using @KWSYS_NAMESPACE@_ios_namespace::ofstream;
using @KWSYS_NAMESPACE@_ios_namespace::ifstream; using @KWSYS_NAMESPACE@_ios_namespace::ifstream;

12
Source/kwsys/ProcessWin32.c
View File

@ -340,7 +340,11 @@ kwsysProcess* kwsysProcess_New(void)
osv.dwOSVersionInfoSize = sizeof(osv); osv.dwOSVersionInfoSize = sizeof(osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif #endif
GetVersionEx(&osv); GetVersionEx(&osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
@ -2382,7 +2386,11 @@ static kwsysProcess_List* kwsysProcess_List_New(void)
osv.dwOSVersionInfoSize = sizeof(osv); osv.dwOSVersionInfoSize = sizeof(osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif #endif
GetVersionEx(&osv); GetVersionEx(&osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx

6
Source/kwsys/SystemInformation.cxx
View File

@ -5069,7 +5069,11 @@ bool SystemInformationImplementation::QueryOSInformation()
osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW); osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif #endif
bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi); bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi);
if (!bOsVersionInfoEx) if (!bOsVersionInfoEx)

6
Source/kwsys/SystemTools.cxx
View File

@ -4732,7 +4732,11 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif #endif
bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *)&osvi); bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *)&osvi);
if (!bOsVersionInfoEx) if (!bOsVersionInfoEx)