FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simgear/debug/logdelta.cxx: don't use and/or keywords, appears to break on vc++?

Browse Source
This commit is contained in:
Julian Smith
2020-11-01 11:49:25 +00:00
parent 2a74cc9e5f
commit 49484d5e86
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
simgear/debug/logdelta.cxx
View File

@@ -82,7 +82,7 @@ struct logDelta
std::string delta = item;
if (delta.empty()
or delta.find_first_not_of("0123456789-+") != std::string::npos
|| delta.find_first_not_of("0123456789-+") != std::string::npos
) {
std::cerr << __FILE__ << ":" << __LINE__ << ": "
<< "Ignoring item '" << item_orig << "'"
@@ -158,7 +158,7 @@ struct logDelta
it = m_cache.find(flf);
assert(m_cache.find(flf)->second == delta);
if (0 and delta != 0) {
if (0 && delta != 0) {
std::cerr << __FILE__ << ":" << __LINE__ << ": "
<< "caching delta=" << delta
<< " for: " << file << ":" << line << ":" << function
@@ -232,7 +232,7 @@ sgDebugPriority logDeltaAdd(sgDebugPriority priority,
int priority_new = (int) priority + log_delta(file, line, function);
// Don't cause new popups.
if (priority < SG_POPUP and priority_new >= SG_POPUP) {
if (priority < SG_POPUP && priority_new >= SG_POPUP) {
priority_new = SG_POPUP - 1;
}
// Keep new priority within range of sgDebugPriority enum.