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

Fix winding_edges using old get() name 

Another attempted fix at VA_ARGS
Fix missing typename prefix
This commit is contained in:
Jonathan 2021-10-05 22:44:13 -04:00
parent f4fc8bc72b
commit b4afc32e2b
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/bspfile.hh
View File

@ -182,10 +182,10 @@ constexpr ADest array_cast(const ASrc &src, const char *overflow_message = "src"
ADest dest{};
for (size_t i = 0; i < std::min(dest.size(), src.size()); i++) {
if constexpr (std::is_arithmetic_v<ADest::value_type> && std::is_arithmetic_v<ASrc::value_type>)
dest[i] = numeric_cast<ADest::value_type>(src[i], overflow_message);
if constexpr (std::is_arithmetic_v<typename ADest::value_type> && std::is_arithmetic_v<typename ASrc::value_type>)
dest[i] = numeric_cast<typename ADest::value_type>(src[i], overflow_message);
else
dest[i] = static_cast<ADest::value_type>(src[i]);
dest[i] = static_cast<typename ADest::value_type>(src[i]);
}
return dest;

6
include/common/cmdlib.hh
View File

@ -120,11 +120,9 @@ template<typename... Args>
}
#ifdef _MSC_VER
#define FError(fmt, ...) Error("{}: " fmt, __func__, __VA_ARGS__)
#define FError(fmt, ...) Error("{}: " fmt, __func__, ##__VA_ARGS__)
#else
#define VA_ARGS(...) , ##__VA_ARGS__
#define FError(fmt, ...) Error("{}: " fmt, __func__ VA_ARGS(__VA_ARGS__))
#undef VA_ARGS
#define FError(fmt, ...) Error("{}: " fmt, __func__, ##__VA_ARGS__)
#endif
using qfile_t = std::unique_ptr<FILE, decltype(&fclose)>;

6
include/common/log.hh
View File

@ -83,11 +83,9 @@ inline void LogPrint(const char *fmt, const Args &...args)
}
#ifdef _MSC_VER
#define FLogPrint(fmt, ...) LogPrint("{}: " fmt, __func__, __VA_ARGS__)
#define FLogPrint(fmt, ...) LogPrint("{}: " fmt, __func__, ##__VA_ARGS__)
#else
#define VA_ARGS(...) , ##__VA_ARGS__
#define FLogPrint(fmt, ...) LogPrint("{}: " fmt, __func__ VA_ARGS(__VA_ARGS__))
#undef VA_ARGS
#define FLogPrint(fmt, ...) LogPrint("{}: " fmt, __func__, ##__VA_ARGS__)
#endif
/* Print only into log file */

2
include/common/polylib.hh
View File

@ -528,7 +528,7 @@ public:
plane_t &dest = result[i];
const qvec3d &v0 = at(i);
const qvec3d &v1 = get((i + 1) % count);
const qvec3d &v1 = at((i + 1) % count);
qvec3d edgevec = qv::normalize(v1 - v0);
qvec3d normal = qv::cross(edgevec, p.normal);