Skip to content

CNLOADS upgrade #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
galanCA wants to merge 7 commits into
base: main
Choose a base branch
from
Open

CNLOADS upgrade #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f67faf0
Hide FPCHECK.
galanCA Jun 2, 2022
1584455
Change static_assert to assert.
galanCA Jun 3, 2022
d977ab8
Fix static_assert for other platforms.
galanCA Jun 3, 2022
bc2989b
Delete include that was previously added.
galanCA Jun 3, 2022
4144b7c
Set FPCHECK as nothing all platforms other than Windows.
galanCA Jun 3, 2022
a43d74f
Add extra line.
galanCA Jun 3, 2022
abb425f
Merge remote-tracking branch 'origin/master' into cnloads-upgrade
galanCA Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/cnglob.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,12 @@ typedef std::string WStr;
/*------------------------------- math -------------------------------------*/
// error handling
extern UINT doControlFP();
#ifdef _WIN32
#define FPCHECK __asm { fwait } // trap pending FP exception (if any)
// re searching for FP exceptions
#else
#define FPCHECK
#endif

// min and max (converted to template fcns, 10-12)
#undef min
Expand Down
12 changes: 6 additions & 6 deletions src/cnloads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3381,13 +3381,13 @@ RC RSYS::rs_EndSubhr()
// verify RSYSRES_IVL_SUB layout at compile time
// fixed sequence allows array access by rs_mode (see code below)
// rsmHEAT/rsmCOOL/rsmOAV definitions must be consistent with member sequences.
#define QZONECHK( m, oDif) static_assert( &((RSYSRES_IVL_SUB *)0)->m-&((RSYSRES_IVL_SUB *)0)->qhZoneSen == oDif, "Bad seq " #m)
#define QZONECHK( m, oDif) static_assert( offsetof(RSYSRES_IVL_SUB, m) - offsetof(RSYSRES_IVL_SUB, qhZoneSen) == oDif, "Bad seq " #m)
QZONECHK(qhZoneSen, (rsmHEAT - 1) * 2);
QZONECHK(qhZoneLat, (rsmHEAT - 1) * 2 + 1);
QZONECHK(qcZoneSen, (rsmCOOL - 1) * 2);
QZONECHK(qcZoneLat, (rsmCOOL - 1) * 2 + 1);
QZONECHK(qvZoneSen, (rsmOAV - 1) * 2);
QZONECHK(qvZoneLat, (rsmOAV - 1) * 2 + 1);
QZONECHK(qhZoneLat, (rsmHEAT - 1) * 2 + sizeof(float));
QZONECHK(qcZoneSen, (rsmCOOL - 1) * 2 * sizeof(float));
QZONECHK(qcZoneLat, (rsmCOOL - 1) * 2 * sizeof(float) + sizeof(float));
QZONECHK(qvZoneSen, (rsmOAV - 1) * 2 * sizeof(float));
QZONECHK(qvZoneLat, (rsmOAV - 1) * 2 * sizeof(float) + sizeof(float));
static_assert(rsmCOUNT == 4, "Bad rsm enum");
#undef QZONECHK

Expand Down