Skip to content
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.

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

Upgrade calc module to EPICS 3.16 #1

Closed
wants to merge 1 commit into from
Closed

Upgrade calc module to EPICS 3.16 #1

wants to merge 1 commit into from

Conversation

hdante
Copy link

@hdante hdante commented Apr 28, 2016

No description provided.

@ralphlange
Copy link
Member

Careful - Base 3.16 is not even "ready for production" yet.
Is this change compatible with 3.14 and 3.15?

@hdante
Copy link
Author

hdante commented Apr 28, 2016

No, this change breaks compatibility with 3.15 and is 3.16 only.

@MarkRivers
Copy link
Member

Then we certainly don't want to merge it into the master branch. It would need to go on a 3.16 branch in calc.

@prjemian prjemian added this to the EPICS base 3.16 milestone Apr 28, 2016
@prjemian
Copy link
Contributor

I created a 3.16 branch and a 3.16 milestone in this repository. @hdante, can you close this PR (on master) and open a new PR on the 3.16 branch? Mark your PR with the "EPICS base 3.16" milestone.

@hdante
Copy link
Author

hdante commented Apr 28, 2016

Moving to another branch

@anjohnson
Copy link
Member

Wrong solution. Instead of using a separate a branch (which would mean you have to make multiple releases, and you have to merge fixes into both branches) you should wrap the change in a conditional that tests the EPICS Base version. Here's how:

#include <epicsVersion.h>
#ifndef EPICS_VERSION_INT
#define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
#define EPICS_VERSION_INT VERSION_INT(EPICS_VERSION, EPICS_REVISION, EPICS_MODIFICATION, EPICS_PATCH_LEVEL)
#endif

// ...

#if EPICS_VERSION_INT < VERSION_INT(3,16,0,1)
    pR = (sseqRecord *)(plink->value.pv_link.precord);
#else
    pR = (sseqRecord *)(plink->precord);
#endif

@MarkRivers
Copy link
Member

Whoops, you're right I should not have suggested new branch.

@prjemian
Copy link
Contributor

agreed

@hdante hdante deleted the 3.16 branch April 29, 2016 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants