diff options
| author | Julius Ikkala <julius.ikkala@gmail.com> | 2025-05-03 02:00:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-02 23:00:42 +0000 |
| commit | 6104a55548133f936b189fad011f90f067fe725b (patch) | |
| tree | 30385fbc5fdb5074212226f09daf6549bef66396 /source | |
| parent | 1b539d8907af3cc77e52e8cf4edf029964e0423a (diff) | |
Fix build on GCC 15 (#6971)
* Fix build on GCC 15
* format code
---------
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'source')
| -rw-r--r-- | source/core/slang-writer.cpp | 2 | ||||
| -rw-r--r-- | source/core/slang-writer.h | 4 | ||||
| -rw-r--r-- | source/slang-glslang/slang-glslang.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source/core/slang-writer.cpp b/source/core/slang-writer.cpp index b3a48d9c7..7fde8cd31 100644 --- a/source/core/slang-writer.cpp +++ b/source/core/slang-writer.cpp @@ -157,7 +157,7 @@ void FileWriter::flush() ::fflush(m_file); } -/* static */ bool FileWriter::isConsole(FILE* file) +/* static */ bool FileWriter::isFileConsole(FILE* file) { const int stdoutFileDesc = _fileno(file); return _isatty(stdoutFileDesc) != 0; diff --git a/source/core/slang-writer.h b/source/core/slang-writer.h index c6822a6e3..f85bebc21 100644 --- a/source/core/slang-writer.h +++ b/source/core/slang-writer.h @@ -135,10 +135,10 @@ public: SLANG_NO_THROW virtual void SLANG_MCALL flush() SLANG_OVERRIDE; SLANG_NO_THROW virtual SlangResult SLANG_MCALL setMode(SlangWriterMode mode) SLANG_OVERRIDE; - static bool isConsole(FILE* file); + static bool isFileConsole(FILE* file); static WriterFlags getDefaultFlags(FILE* file) { - return isConsole(file) ? WriterFlags(WriterFlag::IsConsole) : 0; + return isFileConsole(file) ? WriterFlags(WriterFlag::IsConsole) : 0; } /// Ctor diff --git a/source/slang-glslang/slang-glslang.h b/source/slang-glslang/slang-glslang.h index d6e10d320..570bddfc3 100644 --- a/source/slang-glslang/slang-glslang.h +++ b/source/slang-glslang/slang-glslang.h @@ -2,6 +2,7 @@ #ifndef SLANG_GLSLANG_H_INCLUDED #define SLANG_GLSLANG_H_INCLUDED +#include <cstdint> #include <cstring> #include <memory> #include <stddef.h> |