* int64b/master: (25 commits)
std/rec: streamline variable names in int64in/int64out
std/rec/test: recMiscTest check in64in/out
ioc/db: dbUnitTest helps support int64
std/rec: ioc64in/outRecord typed rset
minor
std/rec: fix copyright in int64in sources
std: remove SCM keywords from int64in and int64out sources
std/rec: fix promptgroups in dbd.pod files
std/rec: add and improve pod for int64in and int64out
std/rec: add pod documentation content for int64out
std/rec: add pod documentation for int64out record
dbStatic: dbPutStringNum() overflow handling
dbStatic: more informative error for bad field value
dbStatic: dbPutStringNum(, "") not an error
Release Notes
cvtFastPerform: Rename reserved member names, fix for vxWorks
Simplify epicsConvertDoubleToFloat()
More cvtFastPerform changes
Collate and report by precision
Restructure cvtFastPerform, fix VxWorks build
...
* linksup/master: (112 commits)
ioc/dbStatic: rename link debugging info tags
jlif future proof for 64-bit json parser
Demonstrate and use numeric literals in calc args
separate jlink and lset debug flags
std/link: runtime conditional debugging in calc/const
std/rec/test: extend linkRetargetLink w/ jlink
ioc/db: dbUnitTest add testdbPutArrFieldOk()
ioc/db: cleanup dbEvent freeLists
ioc/db: dbUnitTest testMonitor leaks dbChannel
std/link: all calc example
jlink conditional debug print
ioc/as: dbCore needs ca
Additional linkInitTest checks
Minimize work done in readLocked routine
Minimize work done in readLocked() routine
Cosmetic changes to various soft device supports
Enhancements to subArray record & soft device support
Fix bug in eventRecord::init_record
Updates to Release Notes and links.html
Make dbLinkIs{Constant|Volatile}() return only true/false
...
Conflicts:
documentation/RELEASE_NOTES.html
src/ioc/db/dbAccess.c
Permit record's use as a look-up-table by reading constant
input array data in dset::read_sa() routine.
Move sub-array operation into a separate function.
Extract subarray from constant INP value at device init.
Reduce the work done inside readLocked() to a minimum.
Limit NELM value to at most MALM in record init routine.
* master: (226 commits)
ioc/db: testdbGetFieldEqual() detect zero size
Cleanup in asLib
Allow whitespace before comments in AS config files
Supress MS warning C4251
Add a plan to std/filters/test/syncTest.c
Fix dbUnitTest.c
avoid void* +=
Fix and test for macLib losing error status
update notes
libCom/test: ipAddrToAsciiTest skip cleanup unless valgrind is possible
libCom/test: add ipAddrToAsciiTest to testHarness
db/test: dbPutGetTest check dbGet() of long string field
db: dbGet() ensure long string nil and actual string length
db/test: dbPutGetTest check for dbGet() attribute crash
db: fix dbGet() for attributes as long string
db/test: dbPutGetTest add test for lp:1678494
db: fix dbGet() of link fields as DBF_CHAR
dbUnitTest: add testdbGetArrFieldEqual()
db/test: add dbPutGetTest
Update release notes as per Michael's review comment
...
Conflicts:
src/ioc/db/dbLink.c
src/ioc/db/test/Makefile
src/std/dev/devSoSoftCallback.c
src/std/rec/boRecord.c
src/std/rec/dfanoutRecord.c
src/std/rec/longinRecord.c
src/std/rec/longoutRecord.c
* launchpad/3.15:
ioc/db: testdbGetFieldEqual() detect zero size
Cleanup in asLib
Allow whitespace before comments in AS config files
Supress MS warning C4251
Add a plan to std/filters/test/syncTest.c
Fix dbUnitTest.c
avoid void* +=
Fix and test for macLib losing error status
update notes
libCom/test: ipAddrToAsciiTest skip cleanup unless valgrind is possible
libCom/test: add ipAddrToAsciiTest to testHarness
Adjusted .gitignore patterns
libCom/test: add network libraries for Windows builds
Moved .bzrignore to .gitignore
libCom/test: add ipAddrToAsciiTest
libCom: revise ipAddrToAscii
