From 5e3311a024af9277542306dc3f2e957863ccfb2f Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Wed, 22 Aug 2012 14:39:19 -0400 Subject: [PATCH 1/2] LICENSE, COPYRIGHT, file header --- COPYRIGHT | 12 ++++ LICENSE | 78 +++++++++++++++++++++++ documentation/pvDataCPP.html | 14 +++- pvDataApp/factory/Compare.cpp | 8 +++ pvDataApp/factory/Convert.cpp | 5 +- pvDataApp/factory/FieldCreateFactory.cpp | 5 +- pvDataApp/factory/PVArray.cpp | 5 +- pvDataApp/factory/PVAuxInfoImpl.cpp | 5 +- pvDataApp/factory/PVDataCreateFactory.cpp | 5 +- pvDataApp/factory/PVField.cpp | 5 +- pvDataApp/factory/PVScalar.cpp | 5 +- pvDataApp/factory/PVScalarArray.cpp | 5 +- pvDataApp/factory/PVStructure.cpp | 5 +- pvDataApp/factory/PVStructureArray.cpp | 5 +- pvDataApp/factory/StandardField.cpp | 5 +- pvDataApp/factory/StandardPVField.cpp | 5 +- pvDataApp/factory/TypeFunc.cpp | 5 +- pvDataApp/factory/factory.h | 5 +- pvDataApp/misc/bitSet.cpp | 5 +- pvDataApp/misc/bitSet.h | 5 +- pvDataApp/misc/byteBuffer.cpp | 5 +- pvDataApp/misc/byteBuffer.h | 5 +- pvDataApp/misc/destroyable.h | 5 +- pvDataApp/misc/epicsException.cpp | 5 +- pvDataApp/misc/epicsException.h | 2 +- pvDataApp/misc/event.cpp | 5 +- pvDataApp/misc/event.h | 5 +- pvDataApp/misc/executor.cpp | 5 +- pvDataApp/misc/executor.h | 5 +- pvDataApp/misc/lock.h | 5 +- pvDataApp/misc/messageQueue.cpp | 5 +- pvDataApp/misc/messageQueue.h | 5 +- pvDataApp/misc/noDefaultMethods.h | 5 +- pvDataApp/misc/queue.h | 5 +- pvDataApp/misc/requester.cpp | 5 +- pvDataApp/misc/requester.h | 5 +- pvDataApp/misc/serialize.h | 5 +- pvDataApp/misc/serializeHelper.cpp | 2 +- pvDataApp/misc/serializeHelper.h | 2 +- pvDataApp/misc/sharedPtr.h | 5 +- pvDataApp/misc/status.cpp | 5 +- pvDataApp/misc/status.h | 5 +- pvDataApp/misc/thread.h | 5 +- pvDataApp/misc/timeFunction.cpp | 5 +- pvDataApp/misc/timeFunction.h | 5 +- pvDataApp/misc/timer.cpp | 5 +- pvDataApp/misc/timer.h | 5 +- pvDataApp/monitor/monitor.h | 5 +- pvDataApp/property/alarm.cpp | 5 +- pvDataApp/property/alarm.h | 5 +- pvDataApp/property/control.h | 5 +- pvDataApp/property/display.h | 5 +- pvDataApp/property/pvAlarm.cpp | 5 +- pvDataApp/property/pvAlarm.h | 5 +- pvDataApp/property/pvControl.cpp | 5 +- pvDataApp/property/pvControl.h | 5 +- pvDataApp/property/pvDisplay.cpp | 5 +- pvDataApp/property/pvDisplay.h | 5 +- pvDataApp/property/pvEnumerated.cpp | 5 +- pvDataApp/property/pvEnumerated.h | 5 +- pvDataApp/property/pvTimeStamp.cpp | 5 +- pvDataApp/property/pvTimeStamp.h | 5 +- pvDataApp/property/timeStamp.cpp | 5 +- pvDataApp/property/timeStamp.h | 5 +- pvDataApp/pv/convert.h | 5 +- pvDataApp/pv/pvData.h | 6 +- pvDataApp/pv/pvIntrospect.h | 6 +- pvDataApp/pv/pvType.h | 6 +- pvDataApp/pv/standardField.h | 5 +- pvDataApp/pv/standardPVField.h | 6 +- pvDataApp/pvMisc/bitSetUtil.cpp | 5 +- pvDataApp/pvMisc/bitSetUtil.h | 5 +- testApp/capi/testc.cpp | 10 +++ testApp/misc/testBaseException.cpp | 2 +- testApp/misc/testBitSet.cpp | 2 +- testApp/misc/testByteBuffer.cpp | 2 +- testApp/misc/testMessageQueue.cpp | 2 +- testApp/misc/testQueue.cpp | 2 +- testApp/misc/testSerialization.cpp | 2 +- testApp/misc/testThread.cpp | 2 +- testApp/misc/testTimeStamp.cpp | 2 +- testApp/misc/testTimer.cpp | 2 +- testApp/monitor/testMonitor.cpp | 2 +- testApp/property/testProperty.cpp | 2 +- testApp/pv/testConvert.cpp | 2 +- testApp/pv/testIntrospect.cpp | 2 +- testApp/pv/testPVAppend.cpp | 2 +- testApp/pv/testPVAuxInfo.cpp | 2 +- testApp/pv/testPVData.cpp | 2 +- testApp/pv/testPVScalarArray.cpp | 2 +- testApp/pv/testPVStructureArray.cpp | 2 +- testApp/pv/testPVType.cpp | 2 +- testApp/pv/testStandardField.cpp | 2 +- testApp/pv/testStandardPVField.cpp | 2 +- 94 files changed, 404 insertions(+), 95 deletions(-) create mode 100644 COPYRIGHT create mode 100644 LICENSE diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000..840d01e --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,12 @@ +/**************************************************** +Copyright (c) 2008 All rights reserved +Copyright (c) 2008 Martin R. Kraimer +Copyright (c) 2006 The University of Chicago, as Operator of Argonne + National Laboratory. +Deutsches Elektronen-Synchroton, Member of the Helmholtz Association, + (DESY), HAMBURG, GERMANY, +BERLINER SPEICHERRING GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. + (BESSY), BERLIN, GERMANY. +COSYLAB (Control System Laboratory) + (Cosylab) Ljubljana Slovenia +*************************************************** */ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1f555ec --- /dev/null +++ b/LICENSE @@ -0,0 +1,78 @@ + +Copyright (c) 2008 Martin R. Kraimer +Copyright (c) 2006 The University of Chicago, as Operator of Argonne + National Laboratory. +Copyright (c) 2006 Deutsches Elektronen-Synchroton, + Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY. +Copyright (c) 2007 Control System Laboratory, + (COSYLAB) Ljubljana Slovenia + + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +________________________________________________________________________ + +This software is in part copyrighted by the University of Chicago (UofC) + +In no event shall UofC be liable to any party for direct, indirect, +special, incidental, or consequential damages arising out of the use of +this software, its documentation, or any derivatives thereof, even if +UofC has been advised of the possibility of such damage. + +UofC specifically disclaims any warranties, including, but not limited +to, the implied warranties of merchantability, fitness for a particular +purpose, and non-infringement. This software is provided on an "as is" +basis, and UofC has no obligation to provide maintenance, support, +updates, enhancements, or modifications. + +________________________________________________________________________ + +This software is in part copyrighted by the BERLINER SPEICHERRING +GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY. + +In no event shall BESSY be liable to any party for direct, indirect, +special, incidental, or consequential damages arising out of the use of +this software, its documentation, or any derivatives thereof, even if +BESSY has been advised of the possibility of such damage. + +BESSY specifically disclaims any warranties, including, but not limited +to, the implied warranties of merchantability, fitness for a particular +purpose, and non-infringement. This software is provided on an "as is" +basis, and BESSY has no obligation to provide maintenance, support, +updates, enhancements, or modifications. + +________________________________________________________________________ + +This software is in part copyrighted by the Deutsches Elektronen-Synchroton, + Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY. + +In no event shall DESY be liable to any party for direct, indirect, +special, incidental, or consequential damages arising out of the use of +this software, its documentation, or any derivatives thereof, even if +DESY has been advised of the possibility of such damage. + +DESY specifically disclaims any warranties, including, but not limited +to, the implied warranties of merchantability, fitness for a particular +purpose, and non-infringement. This software is provided on an "as is" +basis, and DESY has no obligation to provide maintenance, support, +updates, enhancements, or modifications. +________________________________________________________________________ diff --git a/documentation/pvDataCPP.html b/documentation/pvDataCPP.html index aea522d..41885bf 100644 --- a/documentation/pvDataCPP.html +++ b/documentation/pvDataCPP.html @@ -38,7 +38,7 @@

EPICS pvDataCPP

-

EPICS v4 Working Group, Working Draft, 20-Aug-2012

+

EPICS v4 Working Group, Working Draft, 22-Aug-2012

This version:

Status of this Document

-

This is the 20-Aug-2012 version of the C++ implementation of pvData. It is a +

This is the 22-Aug-2012 version of the C++ implementation of pvData. It is a complete implementation of pvData as currently defined.

TODO

@@ -866,6 +866,7 @@ public: virtual bool equals(PVField &pv); virtual void toString(StringBuilder buf) ; virtual void toString(StringBuilder buf,int indentLevel); + std::ostream& dumpValue(std::ostream& o) const; ... } @@ -928,6 +929,8 @@ public:
toString
Converts the field data to a string. This is mostly for debugging purposes.
+
dumpValue
+
Method for streams I/O.

PVAuxInfo

@@ -1094,6 +1097,7 @@ public: typedef PVScalarArray &reference; typedef const PVScalarArray& const_reference; const ScalarArrayConstPtr getScalarArray() const ; + virtual std::ostream& dumpValue(std::ostream& o, size_t index) const = 0; ... } @@ -1101,6 +1105,8 @@ public:
getScalarArray
Get the introspection interface.
+
dumpValue
+
Method for streams I/O.

PVValueArray

@@ -1136,6 +1142,8 @@ public: virtual pointer get() const = 0; virtual vector const & getVector() = 0; virtual shared_vector const & getSharedVector() = 0; + std::ostream& dumpValue(std::ostream& o) const; + std::ostream& dumpValue(std::ostream& o, size_t index) const; protected: PVValueArray(ScalarArrayConstPtr const & scalar) : PVScalarArray(scalar) {} @@ -1242,6 +1250,8 @@ typedef std::tr1::shared_ptr<PVStringArray> PVStringArrayPtr;
Get the vector holding the raw array.
getSharedVector()
Get the shared vector holding the data.
+
dumpValue
+
Method for streams I/O.

Both get and put return the number of elements actually transfered. The diff --git a/pvDataApp/factory/Compare.cpp b/pvDataApp/factory/Compare.cpp index b62f3c9..9830478 100644 --- a/pvDataApp/factory/Compare.cpp +++ b/pvDataApp/factory/Compare.cpp @@ -1,3 +1,11 @@ +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * EPICS pvData is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. + */ +/** + * @author mes + */ #include diff --git a/pvDataApp/factory/Convert.cpp b/pvDataApp/factory/Convert.cpp index a28dde2..9ba5905 100644 --- a/pvDataApp/factory/Convert.cpp +++ b/pvDataApp/factory/Convert.cpp @@ -1,9 +1,12 @@ /* Convert.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/FieldCreateFactory.cpp b/pvDataApp/factory/FieldCreateFactory.cpp index e168dee..58fc47c 100644 --- a/pvDataApp/factory/FieldCreateFactory.cpp +++ b/pvDataApp/factory/FieldCreateFactory.cpp @@ -1,9 +1,12 @@ /*FieldCreateFactory.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/PVArray.cpp b/pvDataApp/factory/PVArray.cpp index efeef1b..cba18ff 100644 --- a/pvDataApp/factory/PVArray.cpp +++ b/pvDataApp/factory/PVArray.cpp @@ -1,9 +1,12 @@ /*PVArray.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include diff --git a/pvDataApp/factory/PVAuxInfoImpl.cpp b/pvDataApp/factory/PVAuxInfoImpl.cpp index c4eacfd..00f7d59 100644 --- a/pvDataApp/factory/PVAuxInfoImpl.cpp +++ b/pvDataApp/factory/PVAuxInfoImpl.cpp @@ -1,9 +1,12 @@ /*PVAuxInfo.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/PVDataCreateFactory.cpp b/pvDataApp/factory/PVDataCreateFactory.cpp index 80ae305..fda75f3 100644 --- a/pvDataApp/factory/PVDataCreateFactory.cpp +++ b/pvDataApp/factory/PVDataCreateFactory.cpp @@ -1,9 +1,12 @@ /*PVDataCreateFactory.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifdef _WIN32 #define NOMINMAX #endif diff --git a/pvDataApp/factory/PVField.cpp b/pvDataApp/factory/PVField.cpp index 827ab14..4e91034 100644 --- a/pvDataApp/factory/PVField.cpp +++ b/pvDataApp/factory/PVField.cpp @@ -1,9 +1,12 @@ /*PVField.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/PVScalar.cpp b/pvDataApp/factory/PVScalar.cpp index 5bf422a..bdccdcd 100644 --- a/pvDataApp/factory/PVScalar.cpp +++ b/pvDataApp/factory/PVScalar.cpp @@ -1,9 +1,12 @@ /*PVScalar.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/PVScalarArray.cpp b/pvDataApp/factory/PVScalarArray.cpp index 4743a59..19d0339 100644 --- a/pvDataApp/factory/PVScalarArray.cpp +++ b/pvDataApp/factory/PVScalarArray.cpp @@ -1,9 +1,12 @@ /*PVScalarArray.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/PVStructure.cpp b/pvDataApp/factory/PVStructure.cpp index a30583b..2e5d506 100644 --- a/pvDataApp/factory/PVStructure.cpp +++ b/pvDataApp/factory/PVStructure.cpp @@ -1,9 +1,12 @@ /*PVStructure.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/PVStructureArray.cpp b/pvDataApp/factory/PVStructureArray.cpp index 11a2309..fa941ef 100644 --- a/pvDataApp/factory/PVStructureArray.cpp +++ b/pvDataApp/factory/PVStructureArray.cpp @@ -1,9 +1,12 @@ /*PVStructureArray.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/StandardField.cpp b/pvDataApp/factory/StandardField.cpp index ec1eaf6..45ccb11 100644 --- a/pvDataApp/factory/StandardField.cpp +++ b/pvDataApp/factory/StandardField.cpp @@ -1,9 +1,12 @@ /* StandardField.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/StandardPVField.cpp b/pvDataApp/factory/StandardPVField.cpp index 9844838..b6f2367 100644 --- a/pvDataApp/factory/StandardPVField.cpp +++ b/pvDataApp/factory/StandardPVField.cpp @@ -1,9 +1,12 @@ /* StandardPVField.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/TypeFunc.cpp b/pvDataApp/factory/TypeFunc.cpp index abea7c3..68075b3 100644 --- a/pvDataApp/factory/TypeFunc.cpp +++ b/pvDataApp/factory/TypeFunc.cpp @@ -1,9 +1,12 @@ /*TypeFunc.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/factory/factory.h b/pvDataApp/factory/factory.h index 3310d47..416f872 100644 --- a/pvDataApp/factory/factory.h +++ b/pvDataApp/factory/factory.h @@ -1,9 +1,12 @@ /*factory.h*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef FACTORY_H #define FACTORY_H diff --git a/pvDataApp/misc/bitSet.cpp b/pvDataApp/misc/bitSet.cpp index fcccf13..4624652 100644 --- a/pvDataApp/misc/bitSet.cpp +++ b/pvDataApp/misc/bitSet.cpp @@ -1,9 +1,12 @@ /* bitSet.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mes + */ #include "string.h" #include "stdio.h" #include diff --git a/pvDataApp/misc/bitSet.h b/pvDataApp/misc/bitSet.h index 83cb45b..0e6334d 100644 --- a/pvDataApp/misc/bitSet.h +++ b/pvDataApp/misc/bitSet.h @@ -1,9 +1,12 @@ /* bitSet.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mse + */ #ifndef BITSET_H #define BITSET_H #include diff --git a/pvDataApp/misc/byteBuffer.cpp b/pvDataApp/misc/byteBuffer.cpp index 71a6cbd..f48b327 100644 --- a/pvDataApp/misc/byteBuffer.cpp +++ b/pvDataApp/misc/byteBuffer.cpp @@ -1,5 +1,8 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mes + */ diff --git a/pvDataApp/misc/byteBuffer.h b/pvDataApp/misc/byteBuffer.h index d816774..87dfbb7 100644 --- a/pvDataApp/misc/byteBuffer.h +++ b/pvDataApp/misc/byteBuffer.h @@ -1,9 +1,12 @@ /* byteBuffer.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mse + */ #ifndef BYTEBUFFER_H #define BYTEBUFFER_H diff --git a/pvDataApp/misc/destroyable.h b/pvDataApp/misc/destroyable.h index a789319..0261371 100644 --- a/pvDataApp/misc/destroyable.h +++ b/pvDataApp/misc/destroyable.h @@ -1,9 +1,12 @@ /* destroyable.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mse + */ #ifndef DESTROYABLE_H #define DESTROYABLE_H diff --git a/pvDataApp/misc/epicsException.cpp b/pvDataApp/misc/epicsException.cpp index b58984f..d7df9e2 100644 --- a/pvDataApp/misc/epicsException.cpp +++ b/pvDataApp/misc/epicsException.cpp @@ -1,8 +1,11 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mes + */ #include diff --git a/pvDataApp/misc/epicsException.h b/pvDataApp/misc/epicsException.h index 1a63606..24025cd 100644 --- a/pvDataApp/misc/epicsException.h +++ b/pvDataApp/misc/epicsException.h @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/pvDataApp/misc/event.cpp b/pvDataApp/misc/event.cpp index 4f2cb28..49c2266 100644 --- a/pvDataApp/misc/event.cpp +++ b/pvDataApp/misc/event.cpp @@ -1,9 +1,12 @@ /* event.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/misc/event.h b/pvDataApp/misc/event.h index a0c3b5d..4581edb 100644 --- a/pvDataApp/misc/event.h +++ b/pvDataApp/misc/event.h @@ -1,9 +1,12 @@ /* event.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef EVENT_H #define EVENT_H #include diff --git a/pvDataApp/misc/executor.cpp b/pvDataApp/misc/executor.cpp index 48054fc..7e6a6e3 100644 --- a/pvDataApp/misc/executor.cpp +++ b/pvDataApp/misc/executor.cpp @@ -1,9 +1,12 @@ /* executor.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/misc/executor.h b/pvDataApp/misc/executor.h index d8118c3..c311d4b 100644 --- a/pvDataApp/misc/executor.h +++ b/pvDataApp/misc/executor.h @@ -1,9 +1,12 @@ /* executor.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef EXECUTOR_H #define EXECUTOR_H #include diff --git a/pvDataApp/misc/lock.h b/pvDataApp/misc/lock.h index 56e2811..e80d356 100644 --- a/pvDataApp/misc/lock.h +++ b/pvDataApp/misc/lock.h @@ -1,9 +1,12 @@ /* lock.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef LOCK_H #define LOCK_H #include diff --git a/pvDataApp/misc/messageQueue.cpp b/pvDataApp/misc/messageQueue.cpp index 1d690c6..4fbdb49 100644 --- a/pvDataApp/misc/messageQueue.cpp +++ b/pvDataApp/misc/messageQueue.cpp @@ -1,9 +1,12 @@ /* messageQueue.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/messageQueue.h b/pvDataApp/misc/messageQueue.h index 3131f2b..d2707d5 100644 --- a/pvDataApp/misc/messageQueue.h +++ b/pvDataApp/misc/messageQueue.h @@ -1,9 +1,12 @@ /* messageQueue.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef MESSAGEQUEUE_H #define MESSAGEQUEUE_H #include diff --git a/pvDataApp/misc/noDefaultMethods.h b/pvDataApp/misc/noDefaultMethods.h index 89eb52d..6ce31e1 100644 --- a/pvDataApp/misc/noDefaultMethods.h +++ b/pvDataApp/misc/noDefaultMethods.h @@ -1,9 +1,12 @@ /* noDefaultMethods.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef NO_DEFAULT_METHODS_H #define NO_DEFAULT_METHODS_H namespace epics { namespace pvData { diff --git a/pvDataApp/misc/queue.h b/pvDataApp/misc/queue.h index a3f93f5..69792ed 100644 --- a/pvDataApp/misc/queue.h +++ b/pvDataApp/misc/queue.h @@ -1,9 +1,12 @@ /* queue.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/misc/requester.cpp b/pvDataApp/misc/requester.cpp index dc9b5dd..a8e5862 100644 --- a/pvDataApp/misc/requester.cpp +++ b/pvDataApp/misc/requester.cpp @@ -1,9 +1,12 @@ /* requester.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/misc/requester.h b/pvDataApp/misc/requester.h index ce04e8c..14d0e2c 100644 --- a/pvDataApp/misc/requester.h +++ b/pvDataApp/misc/requester.h @@ -1,9 +1,12 @@ /* requester.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef REQUESTER_H #define REQUESTER_H #include diff --git a/pvDataApp/misc/serialize.h b/pvDataApp/misc/serialize.h index 7d0e024..ae6c74b 100644 --- a/pvDataApp/misc/serialize.h +++ b/pvDataApp/misc/serialize.h @@ -1,9 +1,12 @@ /* serialize.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef SERIALIZE_H #define SERIALIZE_H #include diff --git a/pvDataApp/misc/serializeHelper.cpp b/pvDataApp/misc/serializeHelper.cpp index 50e1dad..d067765 100644 --- a/pvDataApp/misc/serializeHelper.cpp +++ b/pvDataApp/misc/serializeHelper.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/pvDataApp/misc/serializeHelper.h b/pvDataApp/misc/serializeHelper.h index 66c22f4..0592d6c 100644 --- a/pvDataApp/misc/serializeHelper.h +++ b/pvDataApp/misc/serializeHelper.h @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/pvDataApp/misc/sharedPtr.h b/pvDataApp/misc/sharedPtr.h index da070d5..a59da34 100644 --- a/pvDataApp/misc/sharedPtr.h +++ b/pvDataApp/misc/sharedPtr.h @@ -1,8 +1,11 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author Michael DavidSaver + */ #ifndef SHAREDPTR_H #define SHAREDPTR_H diff --git a/pvDataApp/misc/status.cpp b/pvDataApp/misc/status.cpp index 72ce592..e28f607 100644 --- a/pvDataApp/misc/status.cpp +++ b/pvDataApp/misc/status.cpp @@ -1,9 +1,12 @@ /*pvData.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/misc/status.h b/pvDataApp/misc/status.h index d0d2012..40b4418 100644 --- a/pvDataApp/misc/status.h +++ b/pvDataApp/misc/status.h @@ -1,9 +1,12 @@ /* status.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mse + */ #ifndef STATUS_H #define STATUS_H diff --git a/pvDataApp/misc/thread.h b/pvDataApp/misc/thread.h index dbbf5d0..344c8d8 100644 --- a/pvDataApp/misc/thread.h +++ b/pvDataApp/misc/thread.h @@ -1,9 +1,12 @@ /* thread.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef THREAD_H #define THREAD_H #include diff --git a/pvDataApp/misc/timeFunction.cpp b/pvDataApp/misc/timeFunction.cpp index 5b43797..02e2bdf 100644 --- a/pvDataApp/misc/timeFunction.cpp +++ b/pvDataApp/misc/timeFunction.cpp @@ -1,9 +1,12 @@ /* timeFunction.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/misc/timeFunction.h b/pvDataApp/misc/timeFunction.h index 8ecd3d4..0e32d57 100644 --- a/pvDataApp/misc/timeFunction.h +++ b/pvDataApp/misc/timeFunction.h @@ -1,9 +1,12 @@ /* timeFunction.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef TIMEFUNCTION_H #define TIMEFUNCTION_H #include diff --git a/pvDataApp/misc/timer.cpp b/pvDataApp/misc/timer.cpp index 5dc6883..23a2315 100644 --- a/pvDataApp/misc/timer.cpp +++ b/pvDataApp/misc/timer.cpp @@ -1,9 +1,12 @@ /* timer.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/misc/timer.h b/pvDataApp/misc/timer.h index 5cdb16c..d8996a1 100644 --- a/pvDataApp/misc/timer.h +++ b/pvDataApp/misc/timer.h @@ -1,9 +1,12 @@ /* timer.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef TIMER_H #define TIMER_H #include diff --git a/pvDataApp/monitor/monitor.h b/pvDataApp/monitor/monitor.h index bd34c42..e0b2a38 100644 --- a/pvDataApp/monitor/monitor.h +++ b/pvDataApp/monitor/monitor.h @@ -1,9 +1,12 @@ /* monitor.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef MONITOR_H #define MONITOR_H diff --git a/pvDataApp/property/alarm.cpp b/pvDataApp/property/alarm.cpp index f77be2b..d15c413 100644 --- a/pvDataApp/property/alarm.cpp +++ b/pvDataApp/property/alarm.cpp @@ -1,9 +1,12 @@ /* alarm.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/alarm.h b/pvDataApp/property/alarm.h index 61f0cbe..2c4fb4c 100644 --- a/pvDataApp/property/alarm.h +++ b/pvDataApp/property/alarm.h @@ -1,9 +1,12 @@ /* alarm.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #ifndef ALARM_H diff --git a/pvDataApp/property/control.h b/pvDataApp/property/control.h index 3e0eb2d..1a5a152 100644 --- a/pvDataApp/property/control.h +++ b/pvDataApp/property/control.h @@ -1,9 +1,12 @@ /* control.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef CONTROL_H #define CONTROL_H namespace epics { namespace pvData { diff --git a/pvDataApp/property/display.h b/pvDataApp/property/display.h index 7733140..0472aca 100644 --- a/pvDataApp/property/display.h +++ b/pvDataApp/property/display.h @@ -1,9 +1,12 @@ /* display.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/pvAlarm.cpp b/pvDataApp/property/pvAlarm.cpp index 49ccb5f..8f7f01c 100644 --- a/pvDataApp/property/pvAlarm.cpp +++ b/pvDataApp/property/pvAlarm.cpp @@ -1,9 +1,12 @@ /* pvAlarm.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/pvAlarm.h b/pvDataApp/property/pvAlarm.h index 60e44a8..89b38d4 100644 --- a/pvDataApp/property/pvAlarm.h +++ b/pvDataApp/property/pvAlarm.h @@ -1,9 +1,12 @@ /* pvAlarm.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef PVALARM_H #define PVALARM_H #include diff --git a/pvDataApp/property/pvControl.cpp b/pvDataApp/property/pvControl.cpp index 49bce4b..86c7f87 100644 --- a/pvDataApp/property/pvControl.cpp +++ b/pvDataApp/property/pvControl.cpp @@ -1,9 +1,12 @@ /* pvControl.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/pvControl.h b/pvDataApp/property/pvControl.h index 755e028..9aa5033 100644 --- a/pvDataApp/property/pvControl.h +++ b/pvDataApp/property/pvControl.h @@ -1,9 +1,12 @@ /* pvControl.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #ifndef PVCONTROL_H diff --git a/pvDataApp/property/pvDisplay.cpp b/pvDataApp/property/pvDisplay.cpp index 69b20fb..03c9413 100644 --- a/pvDataApp/property/pvDisplay.cpp +++ b/pvDataApp/property/pvDisplay.cpp @@ -1,9 +1,12 @@ /* pvDisplay.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/pvDisplay.h b/pvDataApp/property/pvDisplay.h index 7749ff0..dbacb7f 100644 --- a/pvDataApp/property/pvDisplay.h +++ b/pvDataApp/property/pvDisplay.h @@ -1,9 +1,12 @@ /* pvDisplay.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/pvEnumerated.cpp b/pvDataApp/property/pvEnumerated.cpp index 42ac61e..b950aa6 100644 --- a/pvDataApp/property/pvEnumerated.cpp +++ b/pvDataApp/property/pvEnumerated.cpp @@ -1,9 +1,12 @@ /* pvEnumerated.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/pvEnumerated.h b/pvDataApp/property/pvEnumerated.h index 3096191..ae55220 100644 --- a/pvDataApp/property/pvEnumerated.h +++ b/pvDataApp/property/pvEnumerated.h @@ -1,9 +1,12 @@ /* pvEnumerated.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/pvTimeStamp.cpp b/pvDataApp/property/pvTimeStamp.cpp index f59a23b..f14e835 100644 --- a/pvDataApp/property/pvTimeStamp.cpp +++ b/pvDataApp/property/pvTimeStamp.cpp @@ -1,9 +1,12 @@ /* pvTimeStamp.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/pvTimeStamp.h b/pvDataApp/property/pvTimeStamp.h index b13d29b..343fa0e 100644 --- a/pvDataApp/property/pvTimeStamp.h +++ b/pvDataApp/property/pvTimeStamp.h @@ -1,9 +1,12 @@ /* pvTimeStamp.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/timeStamp.cpp b/pvDataApp/property/timeStamp.cpp index 1f16a4a..b62af29 100644 --- a/pvDataApp/property/timeStamp.cpp +++ b/pvDataApp/property/timeStamp.cpp @@ -1,9 +1,12 @@ /* timeStamp.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/property/timeStamp.h b/pvDataApp/property/timeStamp.h index 863a793..1bcd25f 100644 --- a/pvDataApp/property/timeStamp.h +++ b/pvDataApp/property/timeStamp.h @@ -1,9 +1,12 @@ /* timeStamp.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #ifndef TIMESTAMP_H #define TIMESTAMP_H #include diff --git a/pvDataApp/pv/convert.h b/pvDataApp/pv/convert.h index e490199..795f578 100644 --- a/pvDataApp/pv/convert.h +++ b/pvDataApp/pv/convert.h @@ -1,10 +1,13 @@ /* convert.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. * Author - Marty Kraimer */ +/** + * @author mrk + */ #ifndef CONVERT_H #define CONVERT_H #include diff --git a/pvDataApp/pv/pvData.h b/pvDataApp/pv/pvData.h index de791d8..af71664 100644 --- a/pvDataApp/pv/pvData.h +++ b/pvDataApp/pv/pvData.h @@ -1,9 +1,11 @@ /* pvData.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. - * Author - Marty Kraimer + */ +/** + * @author mrk */ #ifndef PVDATA_H #define PVDATA_H diff --git a/pvDataApp/pv/pvIntrospect.h b/pvDataApp/pv/pvIntrospect.h index 48a4636..450b599 100644 --- a/pvDataApp/pv/pvIntrospect.h +++ b/pvDataApp/pv/pvIntrospect.h @@ -1,9 +1,11 @@ /* pvIntrospect.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. - * Author - Marty Kraimer + */ +/** + * @author mrk and Michael Davidsaver */ #ifndef PVINTROSPECT_H #define PVINTROSPECT_H diff --git a/pvDataApp/pv/pvType.h b/pvDataApp/pv/pvType.h index 30322bf..50289ec 100644 --- a/pvDataApp/pv/pvType.h +++ b/pvDataApp/pv/pvType.h @@ -1,9 +1,11 @@ /* pvType.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. - * Author - Marty Kraimer + */ +/** + * @author mrk */ /* Definitions for the primitive types for pvData. diff --git a/pvDataApp/pv/standardField.h b/pvDataApp/pv/standardField.h index fdfd636..a90f1f4 100644 --- a/pvDataApp/pv/standardField.h +++ b/pvDataApp/pv/standardField.h @@ -1,10 +1,13 @@ /* standardField.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. * Author - Marty Kraimer */ +/** + * @author mrk + */ #ifndef STANDARDFIELD_H #define STANDARDFIELD_H #include diff --git a/pvDataApp/pv/standardPVField.h b/pvDataApp/pv/standardPVField.h index 1cde94e..7faa028 100644 --- a/pvDataApp/pv/standardPVField.h +++ b/pvDataApp/pv/standardPVField.h @@ -1,9 +1,11 @@ /* standardPVField.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. - * Author - Marty Kraimer + */ +/** + * @author mrk */ #ifndef STANDARDPVFIELD_H #define STANDARDPVFIELD_H diff --git a/pvDataApp/pvMisc/bitSetUtil.cpp b/pvDataApp/pvMisc/bitSetUtil.cpp index 9c9392c..8df28ba 100644 --- a/pvDataApp/pvMisc/bitSetUtil.cpp +++ b/pvDataApp/pvMisc/bitSetUtil.cpp @@ -1,9 +1,12 @@ /*bitSetUtil.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mrk + */ #include #include #include diff --git a/pvDataApp/pvMisc/bitSetUtil.h b/pvDataApp/pvMisc/bitSetUtil.h index 3032583..44fac32 100644 --- a/pvDataApp/pvMisc/bitSetUtil.h +++ b/pvDataApp/pvMisc/bitSetUtil.h @@ -1,9 +1,12 @@ /*bitSetUtil.h*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ +/** + * @author mes + */ #ifndef BITSETUTIL_H #define BITSETUTIL_H #include diff --git a/testApp/capi/testc.cpp b/testApp/capi/testc.cpp index 0f6292c..3976c51 100644 --- a/testApp/capi/testc.cpp +++ b/testApp/capi/testc.cpp @@ -1,3 +1,13 @@ +/* channelBase.h */ +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * EPICS pvData is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. + */ +/** + * @author mrk + */ + #include #include #include diff --git a/testApp/misc/testBaseException.cpp b/testApp/misc/testBaseException.cpp index 6c0d3fb..cf9cd49 100644 --- a/testApp/misc/testBaseException.cpp +++ b/testApp/misc/testBaseException.cpp @@ -1,7 +1,7 @@ /* testBaseException.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Matej Sekoranja Date: 2010.10.18 */ diff --git a/testApp/misc/testBitSet.cpp b/testApp/misc/testBitSet.cpp index 85b5e65..88aaa3c 100644 --- a/testApp/misc/testBitSet.cpp +++ b/testApp/misc/testBitSet.cpp @@ -1,7 +1,7 @@ /* testBitSet.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Matej Sekoranja Date: 2010.10.18 */ diff --git a/testApp/misc/testByteBuffer.cpp b/testApp/misc/testByteBuffer.cpp index 8f39405..9c5762d 100644 --- a/testApp/misc/testByteBuffer.cpp +++ b/testApp/misc/testByteBuffer.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/testApp/misc/testMessageQueue.cpp b/testApp/misc/testMessageQueue.cpp index 708fe71..67ce0a5 100644 --- a/testApp/misc/testMessageQueue.cpp +++ b/testApp/misc/testMessageQueue.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/testApp/misc/testQueue.cpp b/testApp/misc/testQueue.cpp index 3363725..2f01ee1 100644 --- a/testApp/misc/testQueue.cpp +++ b/testApp/misc/testQueue.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/testApp/misc/testSerialization.cpp b/testApp/misc/testSerialization.cpp index 4f4f8a7..41045f0 100644 --- a/testApp/misc/testSerialization.cpp +++ b/testApp/misc/testSerialization.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/testApp/misc/testThread.cpp b/testApp/misc/testThread.cpp index 53fd158..5ca2d21 100644 --- a/testApp/misc/testThread.cpp +++ b/testApp/misc/testThread.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/testApp/misc/testTimeStamp.cpp b/testApp/misc/testTimeStamp.cpp index 386ed7b..a0f48dd 100644 --- a/testApp/misc/testTimeStamp.cpp +++ b/testApp/misc/testTimeStamp.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/testApp/misc/testTimer.cpp b/testApp/misc/testTimer.cpp index 791ee91..7c33d17 100644 --- a/testApp/misc/testTimer.cpp +++ b/testApp/misc/testTimer.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/testApp/monitor/testMonitor.cpp b/testApp/monitor/testMonitor.cpp index 9d06f8b..f5adfa3 100644 --- a/testApp/monitor/testMonitor.cpp +++ b/testApp/monitor/testMonitor.cpp @@ -1,7 +1,7 @@ /* testPVdata.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.11 */ diff --git a/testApp/property/testProperty.cpp b/testApp/property/testProperty.cpp index 2abe1e5..b1a46fb 100644 --- a/testApp/property/testProperty.cpp +++ b/testApp/property/testProperty.cpp @@ -1,7 +1,7 @@ /* testPVdata.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.11 */ diff --git a/testApp/pv/testConvert.cpp b/testApp/pv/testConvert.cpp index d943a26..4675c96 100644 --- a/testApp/pv/testConvert.cpp +++ b/testApp/pv/testConvert.cpp @@ -1,7 +1,7 @@ /* testConvert.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.11 */ diff --git a/testApp/pv/testIntrospect.cpp b/testApp/pv/testIntrospect.cpp index ea98957..3577f2b 100644 --- a/testApp/pv/testIntrospect.cpp +++ b/testApp/pv/testIntrospect.cpp @@ -1,7 +1,7 @@ /* testIntrospect.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.09 */ diff --git a/testApp/pv/testPVAppend.cpp b/testApp/pv/testPVAppend.cpp index 4333367..0f07dfe 100644 --- a/testApp/pv/testPVAppend.cpp +++ b/testApp/pv/testPVAppend.cpp @@ -1,7 +1,7 @@ /* testPVAppend.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.11 */ diff --git a/testApp/pv/testPVAuxInfo.cpp b/testApp/pv/testPVAuxInfo.cpp index f38e7aa..fb1a0e0 100644 --- a/testApp/pv/testPVAuxInfo.cpp +++ b/testApp/pv/testPVAuxInfo.cpp @@ -1,7 +1,7 @@ /* testPVAuxInfo.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.11 */ diff --git a/testApp/pv/testPVData.cpp b/testApp/pv/testPVData.cpp index a877424..bb60a2a 100644 --- a/testApp/pv/testPVData.cpp +++ b/testApp/pv/testPVData.cpp @@ -1,7 +1,7 @@ /* testPVdata.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.11 */ diff --git a/testApp/pv/testPVScalarArray.cpp b/testApp/pv/testPVScalarArray.cpp index ed644ec..85714df 100644 --- a/testApp/pv/testPVScalarArray.cpp +++ b/testApp/pv/testPVScalarArray.cpp @@ -1,7 +1,7 @@ /* testPVScalarArray.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.11 */ diff --git a/testApp/pv/testPVStructureArray.cpp b/testApp/pv/testPVStructureArray.cpp index b550047..8614271 100644 --- a/testApp/pv/testPVStructureArray.cpp +++ b/testApp/pv/testPVStructureArray.cpp @@ -1,7 +1,7 @@ /* testPVStructureArray.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.10 */ diff --git a/testApp/pv/testPVType.cpp b/testApp/pv/testPVType.cpp index bf214cf..9409a28 100644 --- a/testApp/pv/testPVType.cpp +++ b/testApp/pv/testPVType.cpp @@ -1,7 +1,7 @@ /* testPVType.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2010.09 */ diff --git a/testApp/pv/testStandardField.cpp b/testApp/pv/testStandardField.cpp index 9412893..efae647 100644 --- a/testApp/pv/testStandardField.cpp +++ b/testApp/pv/testStandardField.cpp @@ -1,7 +1,7 @@ /* testStandardField.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2012.08 */ diff --git a/testApp/pv/testStandardPVField.cpp b/testApp/pv/testStandardPVField.cpp index 420f482..675cf15 100644 --- a/testApp/pv/testStandardPVField.cpp +++ b/testApp/pv/testStandardPVField.cpp @@ -1,7 +1,7 @@ /* testStandardPVField.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * EPICS pvData is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* Author: Marty Kraimer Date: 2012.08 */ From 6b4eb1a1b08d63e9f6524183f06487dfc5370558 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 28 Aug 2012 13:09:37 -0400 Subject: [PATCH 2/2] StandardField: fix enumeratedAlarm ; testConvert fix uint64 integer constants --- pvDataApp/factory/StandardField.cpp | 2 +- testApp/pv/testConvert.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pvDataApp/factory/StandardField.cpp b/pvDataApp/factory/StandardField.cpp index 45ccb11..d5e9f5d 100644 --- a/pvDataApp/factory/StandardField.cpp +++ b/pvDataApp/factory/StandardField.cpp @@ -393,7 +393,7 @@ static void createEnumeratedAlarm() { names[1] = "stateSeverity"; names[2] = "changeStateSeverity"; fields[0] = fieldCreate->createScalar(pvBoolean); - fields[1] = fieldCreate->createScalar(pvInt); + fields[1] = fieldCreate->createScalarArray(pvInt); fields[2] = fieldCreate->createScalar(pvInt); enumeratedAlarmField = fieldCreate->createStructure("valueAlarm_t",names,fields); } diff --git a/testApp/pv/testConvert.cpp b/testApp/pv/testConvert.cpp index 4675c96..48763d0 100644 --- a/testApp/pv/testConvert.cpp +++ b/testApp/pv/testConvert.cpp @@ -177,7 +177,7 @@ static void testConvertScalar(FILE *fd) { fprintf(fd,"fromInt PASSED\n"); if(debug) fprintf(fd,"\nfromLong\n"); - int64 lval = 0x7fffffffffffffffL; + int64 lval = 0x7fffffffffffffffLL; for(int i=0; i<3; i++) { convert->fromLong(pvBytePtr, lval); builder.clear(); pvBytePtr->toString(&builder); @@ -349,7 +349,7 @@ static void testConvertScalar(FILE *fd) { fprintf(fd,"fromUInt PASSED\n"); if(debug) fprintf(fd,"\nfromULong\n"); - uint64 ulval = 0x7fffffffffffffffL; + uint64 ulval = 0x7fffffffffffffffLL; for(int i=0; i<3; i++) { convert->fromULong(pvBytePtr, ulval); builder.clear(); pvBytePtr->toString(&builder); @@ -537,7 +537,7 @@ static void testConvertScalarArray(FILE *fd) { if(debug) fprintf(fd,"\nfromLong\n"); int64 larray[length]; - int64 lval = 0x7fffffffffffffff; + int64 lval = 0x7fffffffffffffffLL; larray[0] = lval; for(size_t i=1; ifromLongArray(pvBytePtr,0,length,larray,0); @@ -709,7 +709,7 @@ static void testConvertScalarArray(FILE *fd) { if(debug) fprintf(fd,"\nfromULong\n"); uint64 ularray[length]; - uint64 ulval = 0x7fffffffffffffff; + uint64 ulval = 0x7fffffffffffffffLL; ularray[0] = ulval; for(size_t i=1; ifromULongArray(pvBytePtr,0,length,ularray,0);