epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merged changes from 3.15 branch, to revno 12702

Browse Source
This commit is contained in:
Andrew Johnson
2015-09-18 18:13:58 -05:00
parent a245c3805a c74eb27474
commit c4b128dfff
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libCom/test/epicsExceptionTest.cpp
View File

@@ -29,7 +29,9 @@ using namespace std;
#if defined ( _MSC_VER )
// some interesting bugs found in the MS implementation of new
# if _MSC_VER > 1310 /* this gets fixed some release after visual studio 7 we hope */
# if _MSC_VER >= 1900
static size_t unsuccessfulNewSize = numeric_limits < size_t > :: max ();
# elif _MSC_VER > 1310 /* this gets fixed some release after visual studio 7 we hope */
static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max ();
# else
static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max () - 100;

7
src/libCom/timer/epicsTimer.cpp
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$

7
src/libCom/timer/timerPrivate.h
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$

8
src/libCom/timer/timerQueueActive.cpp
View File

@@ -1,13 +1,13 @@
/*************************************************************************\
* 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$
*
* Author Jeffrey O. Hill
* johill@lanl.gov

8
src/std/rec/biRecord.dbd
View File

@@ -29,21 +29,21 @@ recordtype(bi) {
}
field(OSV,DBF_MENU) {
prompt("One Error Severity")
promptgroup(GUI_BITS1)
promptgroup(GUI_ALARMS)
pp(TRUE)
interest(1)
menu(menuAlarmSevr)
}
field(COSV,DBF_MENU) {
prompt("Change of State Svr")
promptgroup(GUI_BITS2)
promptgroup(GUI_ALARMS)
pp(TRUE)
interest(1)
menu(menuAlarmSevr)
}
field(ZNAM,DBF_STRING) {
prompt("Zero Name")
promptgroup(GUI_CALC)
promptgroup(GUI_DISPLAY)
pp(TRUE)
interest(1)
size(26)
@@ -51,7 +51,7 @@ recordtype(bi) {
}
field(ONAM,DBF_STRING) {
prompt("One Name")
promptgroup(GUI_CLOCK)
promptgroup(GUI_DISPLAY)
pp(TRUE)
interest(1)
size(26)