diff options
| author | Jay Kwak <82421531+jkwak-work@users.noreply.github.com> | 2025-04-17 02:34:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-17 09:34:39 +0000 |
| commit | 04db5a95657a8c1ad1db36570eadaeedbea01cbb (patch) | |
| tree | 4d61bd130c86a0d60c55bf1fa14e79b6fce8dcd7 /source/core | |
| parent | 297417c754961d2c1c3f8a2e94126c668e4574bc (diff) | |
Fix compiler warning with clang 18.1.8 on windows (#6843)
* Fix compiler warning with clang 18.1.8 on windows
Diffstat (limited to 'source/core')
| -rw-r--r-- | source/core/slang-castable.h | 5 | ||||
| -rw-r--r-- | source/core/slang-io.cpp | 6 | ||||
| -rw-r--r-- | source/core/slang-stream.cpp | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source/core/slang-castable.h b/source/core/slang-castable.h index 50b41766a..e3591577d 100644 --- a/source/core/slang-castable.h +++ b/source/core/slang-castable.h @@ -77,7 +77,10 @@ public: // IBoxValue virtual SLANG_NO_THROW void* SLANG_MCALL getValuePtr() SLANG_OVERRIDE { return &m_value; } - virtual SlangUUID SLANG_MCALL getValueTypeGuid() SLANG_OVERRIDE { return T::getTypeGuid(); } + virtual SLANG_NO_THROW SlangUUID SLANG_MCALL getValueTypeGuid() SLANG_OVERRIDE + { + return T::getTypeGuid(); + } BoxValue() {} diff --git a/source/core/slang-io.cpp b/source/core/slang-io.cpp index 3c0c9a11e..5490294ca 100644 --- a/source/core/slang-io.cpp +++ b/source/core/slang-io.cpp @@ -1331,7 +1331,7 @@ SlangResult LockFile::tryLock(LockType lockType) SlangResult result = SLANG_OK; #if SLANG_WINDOWS_FAMILY - OVERLAPPED overlapped = {0}; + OVERLAPPED overlapped = {}; DWORD flags = lockType == LockType::Shared ? LOCKFILE_FAIL_IMMEDIATELY : (LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY); @@ -1356,7 +1356,7 @@ SlangResult LockFile::lock(LockType lockType) SlangResult result = SLANG_OK; #if SLANG_WINDOWS_FAMILY - OVERLAPPED overlapped = {0}; + OVERLAPPED overlapped = {}; overlapped.hEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL); DWORD flags = lockType == LockType::Shared ? 0 : LOCKFILE_EXCLUSIVE_LOCK; if (::LockFileEx(m_fileHandle, flags, DWORD(0), ~DWORD(0), ~DWORD(0), &overlapped) == 0) @@ -1392,7 +1392,7 @@ SlangResult LockFile::unlock() return SLANG_E_CANNOT_OPEN; #if SLANG_WINDOWS_FAMILY - OVERLAPPED overlapped = {0}; + OVERLAPPED overlapped = {}; if (::UnlockFileEx(m_fileHandle, DWORD(0), ~DWORD(0), ~DWORD(0), &overlapped) == 0) { return SLANG_E_INTERNAL_FAIL; diff --git a/source/core/slang-stream.cpp b/source/core/slang-stream.cpp index 1b8468c04..07c7e858c 100644 --- a/source/core/slang-stream.cpp +++ b/source/core/slang-stream.cpp @@ -163,8 +163,7 @@ SlangResult FileStream::_init( return SLANG_FAIL; } if (share == FileShare::None) -#pragma warning(suppress : 4996) - m_handle = _wfopen(fileName.toWString(), wideMode); + _wfopen_s(&m_handle, fileName.toWString(), wideMode); else m_handle = _wfsopen(fileName.toWString(), wideMode, shFlag); #else |