Merged changes from 3.14 branch, to revno 12604

This commit is contained in:
Andrew Johnson
2015-09-18 11:51:51 -05:00
7 changed files with 29 additions and 19 deletions

View File

@@ -1,11 +1,10 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
* Copyright (c) 2015 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
* $Revision-Id$
@@ -70,6 +69,7 @@ epicsTimerQueueActiveForC ::
bool okToShare, unsigned priority ) :
timerQueueActive ( refMgr, okToShare, priority )
{
timerQueueActive::start();
}
epicsTimerQueueActiveForC::~epicsTimerQueueActiveForC ()