* 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
* launchpad/3.15:
rename iocshFind -> iocshFindCommand
Added patch
Changed function outputs to remove pointer to next function.
more whitespace
whitespace
Added functions to allow access to what functions and variables the ioc shell has registered.
missing include
ioc/dbStatic: dbFreeBase() don't double free alias'd records
ioc/dbStatic: plug leak in dbFreeBase()
ioc/dbStatic: whitespace
Fix indentation warning from GCC
libCom/test: errlog test more verbose
libCom: STATIC_ASSERT use c++11 static_assert when possible
Check for empty PV names in Perl catools
Conflicts:
src/std/rec/subRecord.c
* launchpad/3.14:
ioc/dbStatic: dbFreeBase() don't double free alias'd records
ioc/dbStatic: plug leak in dbFreeBase()
ioc/dbStatic: whitespace
Fix indentation warning from GCC
libCom/test: errlog test more verbose
libCom: STATIC_ASSERT use c++11 static_assert when possible
Check for empty PV names in Perl catools
Conflicts:
src/ioc/dbStatic/dbStaticLib.c
src/libCom/osi/epicsAssert.h
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.
Look up event handle /after/ the device init routine has been run,
in case it modified the event name in VAL. That didn't used to
be possible because constant links couldn't return strings.
* 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
* removed struct valueDes
* made get_value take void (no arguments), added deprecation note
* removed misleading array size comment for get_units
Also added const to method parameters exactly where called in base with
const arguments.
This means:
* typed method definitions for struct rset
* using REC_TYPE macro in place of dbCommon
* define REC_TYPE as dbCommon unless defined
* in record supports, define REC_TYPE before including epics headers
* fix a few method types in record supports (e.g. void* -> REC_TYPE*)
* fix the type errors gcc finds in dbAccess.c and dbConvert.c