Merge 3.15 branch into 7.0

2019-07-25 18:10:40 -05:00
parent e2881fb37e a6812c5869
commit 59cffd51ae
25 changed files with 256 additions and 294 deletions
@@ -205,9 +205,6 @@ epicsTime::epicsTime (const epicsTimeStamp &ts)
 epicsTime::epicsTime () :
    secPastEpoch(0u), nSec(0u) {}

-epicsTime::epicsTime (const epicsTime &t) :
-    secPastEpoch (t.secPastEpoch), nSec (t.nSec) {}
-
 epicsTime epicsTime::getCurrent ()
 {
    epicsTimeStamp current;