Merge branch 'master' into qbsp-use-common

CMakeLists.txt

@@ -122,6 +122,10 @@ if (MSVC)
 	add_definitions("/wd4244") # disable "conversion from .. to .., possible loss of data" 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("/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)
 
 # 10.9: minimum version that supports unordered_map

common/cmdlib.cc

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

common/threads.cc

@@ -12,7 +12,7 @@
  *         thread/logging code.  Error() would normally be defined in
  *         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));
 
 /* Make the locks no-ops if we aren't running threads */

include/common/cmdlib.hh

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

include/qbsp/util.hh

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