olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into qbsp-use-common

This commit is contained in:
Eric Wasylishen 2021-08-26 21:14:49 -06:00
parent 899b2b8384 8beda9a039
commit bafea15753
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -122,6 +122,10 @@ if (MSVC)
add_definitions("/wd4244") # disable "conversion from .. to .., possible loss of data" warning add_definitions("/wd4244") # disable "conversion from .. to .., possible loss of data" warning
add_definitions("/wd4018") # disable "signed/unsigned mismatch" warning add_definitions("/wd4018") # disable "signed/unsigned mismatch" warning
add_definitions("/wd4200") # disable "nonstandard extension used: zero-sized array in struct/union" warning add_definitions("/wd4200") # disable "nonstandard extension used: zero-sized array in struct/union" warning
add_definitions("/wd4264") # disable "conversion from 'size_t' to 'int', possible loss of data" warning
add_definitions("/wd4267") # disable "conversion from 'size_t' to 'int', possible loss of data" warning
add_definitions("/wd4305") # disable "truncation from 'double' to 'float'" warning
endif (MSVC) endif (MSVC)
# 10.9: minimum version that supports unordered_map # 10.9: minimum version that supports unordered_map

2
common/cmdlib.cc
View File

@ -57,7 +57,7 @@ char archivedir[1024];
* For abnormal program terminations * For abnormal program terminations
* ================= * =================
*/ */
void [[noreturn]] void
Error(const char *error, ...) Error(const char *error, ...)
{ {
va_list argptr; va_list argptr;

2
common/threads.cc
View File

@ -12,7 +12,7 @@
* thread/logging code. Error() would normally be defined in * thread/logging code. Error() would normally be defined in
* either common/cmdlib.h or qbsp/qbsp.h. * either common/cmdlib.h or qbsp/qbsp.h.
*/ */
void Error(const char *error, ...) [[noreturn]] void Error(const char *error, ...)
__attribute__((format(printf,1,2),noreturn)); __attribute__((format(printf,1,2),noreturn));
/* Make the locks no-ops if we aren't running threads */ /* Make the locks no-ops if we aren't running threads */

2
include/common/cmdlib.hh
View File

@ -81,7 +81,7 @@ char *ExpandPathAndArchive(char *path);
double I_FloatTime(void); double I_FloatTime(void);
void Error(const char *error, ...) [[noreturn]] void Error(const char *error, ...)
__attribute__((format(printf,1,2),noreturn)); __attribute__((format(printf,1,2),noreturn));
int CheckParm(const char *check); int CheckParm(const char *check);

2
include/qbsp/util.hh
View File

@ -35,7 +35,7 @@ extern const char *rgszWarnings[cWarnings];
void *AllocMem(int Type, int cSize, bool fZero); void *AllocMem(int Type, int cSize, bool fZero);
void Message(int MsgType, ...); void Message(int MsgType, ...);
void Error(const char *error, ...) [[noreturn]] void Error(const char *error, ...)
__attribute__((format(printf,1,2),noreturn)); __attribute__((format(printf,1,2),noreturn));
int q_snprintf(char *str, size_t size, const char *format, ...); int q_snprintf(char *str, size_t size, const char *format, ...);