From 619534b984084879e907ed99860a2dcf81c200e7 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 7 Jun 2011 08:30:15 -0400 Subject: [PATCH] include files put into include/pv --- configure/CONFIG_SITE | 3 ++ pvDataApp/factory/Compare.cpp | 2 +- pvDataApp/factory/Convert.cpp | 8 ++--- pvDataApp/factory/DefaultPVStructureArray.cpp | 8 ++--- pvDataApp/factory/DefaultPVStructureArray.h | 8 ++--- pvDataApp/factory/FieldCreateFactory.cpp | 10 +++--- pvDataApp/factory/PVArray.cpp | 4 +-- pvDataApp/factory/PVAuxInfoImpl.cpp | 12 +++---- pvDataApp/factory/PVDataCreateFactory.cpp | 12 +++---- pvDataApp/factory/PVField.cpp | 10 +++--- pvDataApp/factory/PVScalar.cpp | 4 +-- pvDataApp/factory/PVScalarArray.cpp | 4 +-- pvDataApp/factory/PVStructure.cpp | 10 +++--- pvDataApp/factory/StandardField.cpp | 8 ++--- pvDataApp/factory/StandardPVField.cpp | 14 ++++---- pvDataApp/factory/TypeFunc.cpp | 4 +-- pvDataApp/misc/CDRMonitor.cpp | 10 +++--- pvDataApp/misc/CDRMonitor.h | 6 ++-- pvDataApp/misc/bitSet.cpp | 8 ++--- pvDataApp/misc/bitSet.h | 6 ++-- pvDataApp/misc/byteBuffer.cpp | 4 +-- pvDataApp/misc/byteBuffer.h | 4 +-- pvDataApp/misc/destroyable.h | 2 +- pvDataApp/misc/epicsException.cpp | 2 +- pvDataApp/misc/event.cpp | 10 +++--- pvDataApp/misc/event.h | 4 +-- pvDataApp/misc/executor.cpp | 12 +++---- pvDataApp/misc/executor.h | 6 ++-- pvDataApp/misc/linkedList.h | 2 +- pvDataApp/misc/linkedListVoid.cpp | 8 ++--- pvDataApp/misc/linkedListVoid.h | 2 +- pvDataApp/misc/lock.h | 2 +- pvDataApp/misc/messageQueue.cpp | 14 ++++---- pvDataApp/misc/messageQueue.h | 6 ++-- pvDataApp/misc/queue.h | 2 +- pvDataApp/misc/queueVoid.cpp | 8 ++--- pvDataApp/misc/requester.cpp | 2 +- pvDataApp/misc/requester.h | 4 +-- pvDataApp/misc/serialize.h | 2 +- pvDataApp/misc/serializeHelper.cpp | 8 ++--- pvDataApp/misc/serializeHelper.h | 8 ++--- pvDataApp/misc/status.cpp | 8 ++--- pvDataApp/misc/status.h | 4 +-- pvDataApp/misc/thread.h | 4 +-- pvDataApp/misc/timeFunction.cpp | 6 ++-- pvDataApp/misc/timeFunction.h | 4 +-- pvDataApp/misc/timer.cpp | 18 +++++----- pvDataApp/misc/timer.h | 8 ++--- pvDataApp/monitor/monitor.h | 10 +++--- pvDataApp/monitor/monitorQueue.cpp | 4 +-- pvDataApp/monitor/monitorQueue.h | 8 ++--- pvDataApp/property/alarm.cpp | 8 ++--- pvDataApp/property/alarm.h | 2 +- pvDataApp/property/display.h | 4 +-- pvDataApp/property/pvAlarm.cpp | 8 ++--- pvDataApp/property/pvAlarm.h | 4 +-- pvDataApp/property/pvControl.cpp | 8 ++--- pvDataApp/property/pvControl.h | 4 +-- pvDataApp/property/pvDisplay.cpp | 8 ++--- pvDataApp/property/pvDisplay.h | 6 ++-- pvDataApp/property/pvEnumerated.cpp | 8 ++--- pvDataApp/property/pvEnumerated.h | 4 +-- pvDataApp/property/pvTimeStamp.cpp | 8 ++--- pvDataApp/property/pvTimeStamp.h | 6 ++-- pvDataApp/property/timeStamp.cpp | 6 ++-- pvDataApp/property/timeStamp.h | 2 +- pvDataApp/pv/convert.h | 4 +-- pvDataApp/pv/pvData.h | 12 +++---- pvDataApp/pv/pvIntrospect.h | 6 ++-- pvDataApp/pv/standardField.h | 2 +- pvDataApp/pv/standardPVField.h | 4 +-- pvDataApp/pvMisc/bitSetUtil.cpp | 6 ++-- pvDataApp/pvMisc/bitSetUtil.h | 6 ++-- test/testBaseException | 8 ++--- test/testBaseException.sh | 34 ++++++++++++++++++- test/testBaseExceptionDiff | 10 +++--- test/testBitSet.sh | 34 ++++++++++++++++++- test/testByteBuffer.sh | 34 ++++++++++++++++++- test/testIntrospect.sh | 34 ++++++++++++++++++- test/testLinkedList.sh | 34 ++++++++++++++++++- test/testLinkedListAux | 24 ++++++------- test/testMessageQueue.sh | 34 ++++++++++++++++++- test/testPVAppend.sh | 34 ++++++++++++++++++- test/testPVAuxInfo.sh | 34 ++++++++++++++++++- test/testPVData.sh | 34 ++++++++++++++++++- test/testPVStructureArray.sh | 34 ++++++++++++++++++- test/testProperty.sh | 34 ++++++++++++++++++- test/testPropertyAux | 2 +- test/testQueue.sh | 34 ++++++++++++++++++- test/testSerialization.sh | 34 ++++++++++++++++++- test/testThread.sh | 34 ++++++++++++++++++- test/testThreadAux | 2 +- test/testTimeStamp.sh | 34 ++++++++++++++++++- test/testTimeStampAux | 8 ++--- test/testTimer.sh | 34 ++++++++++++++++++- test/testTimerAux | 12 +++---- testApp/misc/testBaseException.cpp | 2 +- testApp/misc/testBitSet.cpp | 4 +-- testApp/misc/testByteBuffer.cpp | 4 +-- testApp/misc/testLinkedList.cpp | 8 ++--- testApp/misc/testMessageQueue.cpp | 16 ++++----- testApp/misc/testQueue.cpp | 14 ++++---- testApp/misc/testSerialization.cpp | 14 ++++---- testApp/misc/testThread.cpp | 10 +++--- testApp/misc/testTimeStamp.cpp | 2 +- testApp/misc/testTimer.cpp | 10 +++--- testApp/property/testProperty.cpp | 32 ++++++++--------- testApp/pv/temp.cpp | 14 ++++---- testApp/pv/testIntrospect.cpp | 12 +++---- testApp/pv/testPVAppend.cpp | 14 ++++---- testApp/pv/testPVAuxInfo.cpp | 14 ++++---- testApp/pv/testPVData.cpp | 14 ++++---- testApp/pv/testPVStructureArray.cpp | 12 +++---- testApp/pv/testPVType.cpp | 4 +-- 114 files changed, 894 insertions(+), 379 deletions(-) mode change 120000 => 100755 test/testBaseException.sh mode change 120000 => 100755 test/testBitSet.sh mode change 120000 => 100755 test/testByteBuffer.sh mode change 120000 => 100755 test/testIntrospect.sh mode change 120000 => 100755 test/testLinkedList.sh mode change 120000 => 100755 test/testMessageQueue.sh mode change 120000 => 100755 test/testPVAppend.sh mode change 120000 => 100755 test/testPVAuxInfo.sh mode change 120000 => 100755 test/testPVData.sh mode change 120000 => 100755 test/testPVStructureArray.sh mode change 120000 => 100755 test/testProperty.sh mode change 120000 => 100755 test/testQueue.sh mode change 120000 => 100755 test/testSerialization.sh mode change 120000 => 100755 test/testThread.sh mode change 120000 => 100755 test/testTimeStamp.sh mode change 120000 => 100755 test/testTimer.sh diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 0a13fc6..d669cbb 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -24,3 +24,6 @@ # define INSTALL_LOCATION here #INSTALL_LOCATION= +INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv +USR_INCLUDES += -I $(INSTALL_LOCATION)/include + diff --git a/pvDataApp/factory/Compare.cpp b/pvDataApp/factory/Compare.cpp index 834e647..01dcaa9 100644 --- a/pvDataApp/factory/Compare.cpp +++ b/pvDataApp/factory/Compare.cpp @@ -1,5 +1,5 @@ -#include "convert.h" +#include #include #include diff --git a/pvDataApp/factory/Convert.cpp b/pvDataApp/factory/Convert.cpp index 1d32416..3174098 100644 --- a/pvDataApp/factory/Convert.cpp +++ b/pvDataApp/factory/Convert.cpp @@ -8,10 +8,10 @@ #include #include #include -#include "lock.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "convert.h" +#include +#include +#include +#include using std::tr1::static_pointer_cast; using std::tr1::const_pointer_cast; diff --git a/pvDataApp/factory/DefaultPVStructureArray.cpp b/pvDataApp/factory/DefaultPVStructureArray.cpp index ebf2719..6a516c4 100644 --- a/pvDataApp/factory/DefaultPVStructureArray.cpp +++ b/pvDataApp/factory/DefaultPVStructureArray.cpp @@ -8,10 +8,10 @@ #include #include #include -#include "pvData.h" -#include "convert.h" -#include "factory.h" -#include "serializeHelper.h" +#include +#include +#include +#include #include "DefaultPVStructureArray.h" using std::tr1::static_pointer_cast; diff --git a/pvDataApp/factory/DefaultPVStructureArray.h b/pvDataApp/factory/DefaultPVStructureArray.h index 683201b..8cfeec2 100644 --- a/pvDataApp/factory/DefaultPVStructureArray.h +++ b/pvDataApp/factory/DefaultPVStructureArray.h @@ -10,10 +10,10 @@ #include #include #include -#include "pvData.h" -#include "convert.h" -#include "factory.h" -#include "serializeHelper.h" +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/factory/FieldCreateFactory.cpp b/pvDataApp/factory/FieldCreateFactory.cpp index dd8c8a1..5152067 100644 --- a/pvDataApp/factory/FieldCreateFactory.cpp +++ b/pvDataApp/factory/FieldCreateFactory.cpp @@ -8,11 +8,11 @@ #include #include #include -#include -#include "pvIntrospect.h" -#include "convert.h" -#include "factory.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include using std::tr1::static_pointer_cast; diff --git a/pvDataApp/factory/PVArray.cpp b/pvDataApp/factory/PVArray.cpp index cdbb98e..3755c8e 100644 --- a/pvDataApp/factory/PVArray.cpp +++ b/pvDataApp/factory/PVArray.cpp @@ -9,8 +9,8 @@ #include #include #include -#include "pvData.h" -#include "factory.h" +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/factory/PVAuxInfoImpl.cpp b/pvDataApp/factory/PVAuxInfoImpl.cpp index 1aac070..6a80ada 100644 --- a/pvDataApp/factory/PVAuxInfoImpl.cpp +++ b/pvDataApp/factory/PVAuxInfoImpl.cpp @@ -8,12 +8,12 @@ #include #include #include -#include "noDefaultMethods.h" -#include "pvData.h" -#include "convert.h" -#include "factory.h" -#include "lock.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/factory/PVDataCreateFactory.cpp b/pvDataApp/factory/PVDataCreateFactory.cpp index 1f8af9c..3d8c719 100644 --- a/pvDataApp/factory/PVDataCreateFactory.cpp +++ b/pvDataApp/factory/PVDataCreateFactory.cpp @@ -8,12 +8,12 @@ #include #include #include -#include "lock.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "convert.h" -#include "factory.h" -#include "serializeHelper.h" +#include +#include +#include +#include +#include +#include #include "DefaultPVStructureArray.h" using std::tr1::static_pointer_cast; diff --git a/pvDataApp/factory/PVField.cpp b/pvDataApp/factory/PVField.cpp index 5175ab6..f23557a 100644 --- a/pvDataApp/factory/PVField.cpp +++ b/pvDataApp/factory/PVField.cpp @@ -8,11 +8,11 @@ #include #include #include -#include "lock.h" -#include "pvData.h" -#include "factory.h" -#include "convert.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include using std::tr1::const_pointer_cast; diff --git a/pvDataApp/factory/PVScalar.cpp b/pvDataApp/factory/PVScalar.cpp index 1aed67e..8111c8e 100644 --- a/pvDataApp/factory/PVScalar.cpp +++ b/pvDataApp/factory/PVScalar.cpp @@ -8,8 +8,8 @@ #include #include #include -#include "pvData.h" -#include "factory.h" +#include +#include using std::tr1::static_pointer_cast; diff --git a/pvDataApp/factory/PVScalarArray.cpp b/pvDataApp/factory/PVScalarArray.cpp index 4927897..f52f67f 100644 --- a/pvDataApp/factory/PVScalarArray.cpp +++ b/pvDataApp/factory/PVScalarArray.cpp @@ -8,8 +8,8 @@ #include #include #include -#include "pvData.h" -#include "factory.h" +#include +#include using std::tr1::static_pointer_cast;using std::tr1::static_pointer_cast; diff --git a/pvDataApp/factory/PVStructure.cpp b/pvDataApp/factory/PVStructure.cpp index e266737..df15472 100644 --- a/pvDataApp/factory/PVStructure.cpp +++ b/pvDataApp/factory/PVStructure.cpp @@ -8,11 +8,11 @@ #include #include #include -#include "pvData.h" -#include "pvIntrospect.h" -#include "convert.h" -#include "factory.h" -#include "bitSet.h" +#include +#include +#include +#include +#include using std::tr1::static_pointer_cast; using std::tr1::const_pointer_cast; diff --git a/pvDataApp/factory/StandardField.cpp b/pvDataApp/factory/StandardField.cpp index 034444b..5497da1 100644 --- a/pvDataApp/factory/StandardField.cpp +++ b/pvDataApp/factory/StandardField.cpp @@ -9,10 +9,10 @@ #include #include #include -#include -#include "pvIntrospect.h" -#include "standardField.h" -#include "CDRMonitor.h" +#include +#include +#include +#include using std::tr1::static_pointer_cast; diff --git a/pvDataApp/factory/StandardPVField.cpp b/pvDataApp/factory/StandardPVField.cpp index c1254f2..ee39c2a 100644 --- a/pvDataApp/factory/StandardPVField.cpp +++ b/pvDataApp/factory/StandardPVField.cpp @@ -8,13 +8,13 @@ #include #include #include -#include -#include "pvIntrospect.h" -#include "pvData.h" -#include "convert.h" -#include "standardField.h" -#include "standardPVField.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/factory/TypeFunc.cpp b/pvDataApp/factory/TypeFunc.cpp index e34366d..a678111 100644 --- a/pvDataApp/factory/TypeFunc.cpp +++ b/pvDataApp/factory/TypeFunc.cpp @@ -9,8 +9,8 @@ #include #include -#include "pvIntrospect.h" -#include "epicsException.h" +#include +#include #include "dbDefs.h" // for NELEMENTS diff --git a/pvDataApp/misc/CDRMonitor.cpp b/pvDataApp/misc/CDRMonitor.cpp index 5f1702f..53b4c7b 100644 --- a/pvDataApp/misc/CDRMonitor.cpp +++ b/pvDataApp/misc/CDRMonitor.cpp @@ -13,11 +13,11 @@ #include -#include "noDefaultMethods.h" -#include "lock.h" -#include "pvType.h" -#include "linkedList.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/CDRMonitor.h b/pvDataApp/misc/CDRMonitor.h index 30d5ead..285de4e 100644 --- a/pvDataApp/misc/CDRMonitor.h +++ b/pvDataApp/misc/CDRMonitor.h @@ -13,9 +13,9 @@ #include #include -#include "noDefaultMethods.h" -#include "lock.h" -#include "pvType.h" +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/bitSet.cpp b/pvDataApp/misc/bitSet.cpp index 10f8207..7abf594 100644 --- a/pvDataApp/misc/bitSet.cpp +++ b/pvDataApp/misc/bitSet.cpp @@ -6,10 +6,10 @@ */ #include "string.h" #include "stdio.h" -#include "bitSet.h" -#include "lock.h" -#include "CDRMonitor.h" -#include "serializeHelper.h" +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/bitSet.h b/pvDataApp/misc/bitSet.h index ccb7478..3dbc3a1 100644 --- a/pvDataApp/misc/bitSet.h +++ b/pvDataApp/misc/bitSet.h @@ -7,9 +7,9 @@ #ifndef BITSET_H #define BITSET_H #include -#include -#include -#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/byteBuffer.cpp b/pvDataApp/misc/byteBuffer.cpp index c39317c..5f3866d 100644 --- a/pvDataApp/misc/byteBuffer.cpp +++ b/pvDataApp/misc/byteBuffer.cpp @@ -10,8 +10,8 @@ * Author: Miha Vitorovic */ #include -#include "byteBuffer.h" -#include "epicsException.h" +#include +#include // TODO optimize, avoid so many checks (endianness, positions), allow wrapping of external buffer, chance of endianess namespace epics { diff --git a/pvDataApp/misc/byteBuffer.h b/pvDataApp/misc/byteBuffer.h index 9a1ddf4..ee89279 100644 --- a/pvDataApp/misc/byteBuffer.h +++ b/pvDataApp/misc/byteBuffer.h @@ -8,10 +8,10 @@ #define BYTEBUFFER_H #include -#include +#include #include -#include "epicsException.h" +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/destroyable.h b/pvDataApp/misc/destroyable.h index 02ae4a0..6858770 100644 --- a/pvDataApp/misc/destroyable.h +++ b/pvDataApp/misc/destroyable.h @@ -7,7 +7,7 @@ #ifndef DESTROYABLE_H #define DESTROYABLE_H -#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/epicsException.cpp b/pvDataApp/misc/epicsException.cpp index 6bb957f..b58984f 100644 --- a/pvDataApp/misc/epicsException.cpp +++ b/pvDataApp/misc/epicsException.cpp @@ -4,7 +4,7 @@ * in file LICENSE that is included with this distribution. */ -#include "epicsException.h" +#include #include diff --git a/pvDataApp/misc/event.cpp b/pvDataApp/misc/event.cpp index 0ecb649..c63ed7d 100644 --- a/pvDataApp/misc/event.cpp +++ b/pvDataApp/misc/event.cpp @@ -16,11 +16,11 @@ #include #include #include -#include "noDefaultMethods.h" -#include "pvType.h" -#include "lock.h" -#include "event.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/event.h b/pvDataApp/misc/event.h index 5ca6a75..83faf2a 100644 --- a/pvDataApp/misc/event.h +++ b/pvDataApp/misc/event.h @@ -9,8 +9,8 @@ #include #include #include -#include "noDefaultMethods.h" -#include "pvType.h" +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/executor.cpp b/pvDataApp/misc/executor.cpp index 680ca7c..ba0bebf 100644 --- a/pvDataApp/misc/executor.cpp +++ b/pvDataApp/misc/executor.cpp @@ -12,12 +12,12 @@ #include #include -#include "linkedList.h" -#include "lock.h" -#include "thread.h" -#include "event.h" -#include "executor.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/executor.h b/pvDataApp/misc/executor.h index bdee599..5fac993 100644 --- a/pvDataApp/misc/executor.h +++ b/pvDataApp/misc/executor.h @@ -8,9 +8,9 @@ #define EXECUTOR_H #include #include -#include "noDefaultMethods.h" -#include "pvType.h" -#include "thread.h" +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/linkedList.h b/pvDataApp/misc/linkedList.h index 1eda3ac..9fa8fe7 100644 --- a/pvDataApp/misc/linkedList.h +++ b/pvDataApp/misc/linkedList.h @@ -6,7 +6,7 @@ */ #ifndef LINKEDLIST_H #define LINKEDLIST_H -#include "linkedListVoid.h" +#include namespace epics { namespace pvData { template diff --git a/pvDataApp/misc/linkedListVoid.cpp b/pvDataApp/misc/linkedListVoid.cpp index 14f2b5e..25eab96 100644 --- a/pvDataApp/misc/linkedListVoid.cpp +++ b/pvDataApp/misc/linkedListVoid.cpp @@ -11,10 +11,10 @@ #include #include -#include "lock.h" -#include "pvType.h" -#include "linkedListVoid.h" -#include "CDRMonitor.h" +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/linkedListVoid.h b/pvDataApp/misc/linkedListVoid.h index 50de2a1..bd92a54 100644 --- a/pvDataApp/misc/linkedListVoid.h +++ b/pvDataApp/misc/linkedListVoid.h @@ -7,7 +7,7 @@ #ifndef LINKEDLISTVOID_H #define LINKEDLISTVOID_H -#include "pvType.h" +#include namespace epics { namespace pvData { class LinkedListVoid; diff --git a/pvDataApp/misc/lock.h b/pvDataApp/misc/lock.h index fc79c70..86348ef 100644 --- a/pvDataApp/misc/lock.h +++ b/pvDataApp/misc/lock.h @@ -8,7 +8,7 @@ #define LOCK_H #include #include -#include "noDefaultMethods.h" +#include /* This is based on item 14 of * Effective C++, Third Edition, Scott Meyers */ diff --git a/pvDataApp/misc/messageQueue.cpp b/pvDataApp/misc/messageQueue.cpp index 6aee813..1f65702 100644 --- a/pvDataApp/misc/messageQueue.cpp +++ b/pvDataApp/misc/messageQueue.cpp @@ -11,13 +11,13 @@ #include #include -#include "pvType.h" -#include "lock.h" -#include "requester.h" -#include "noDefaultMethods.h" -#include "CDRMonitor.h" -#include "queue.h" -#include "messageQueue.h" +#include +#include +#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/messageQueue.h b/pvDataApp/misc/messageQueue.h index 6437f0e..164f206 100644 --- a/pvDataApp/misc/messageQueue.h +++ b/pvDataApp/misc/messageQueue.h @@ -6,9 +6,9 @@ */ #ifndef MESSAGEQUEUE_H #define MESSAGEQUEUE_H -#include "pvType.h" -#include "requester.h" -#include "noDefaultMethods.h" +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/queue.h b/pvDataApp/misc/queue.h index 2b808d6..013a772 100644 --- a/pvDataApp/misc/queue.h +++ b/pvDataApp/misc/queue.h @@ -6,7 +6,7 @@ */ #ifndef QUEUE_H #define QUEUE_H -#include "queueVoid.h" +#include namespace epics { namespace pvData { template diff --git a/pvDataApp/misc/queueVoid.cpp b/pvDataApp/misc/queueVoid.cpp index f94ee1f..1708606 100644 --- a/pvDataApp/misc/queueVoid.cpp +++ b/pvDataApp/misc/queueVoid.cpp @@ -11,10 +11,10 @@ #include #include -#include "lock.h" -#include "pvType.h" -#include "queueVoid.h" -#include "CDRMonitor.h" +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/requester.cpp b/pvDataApp/misc/requester.cpp index dd36d01..d9b826e 100644 --- a/pvDataApp/misc/requester.cpp +++ b/pvDataApp/misc/requester.cpp @@ -5,7 +5,7 @@ * in file LICENSE that is included with this distribution. */ #include -#include "requester.h" +#include namespace epics { namespace pvData { static std::string typeName[] = { diff --git a/pvDataApp/misc/requester.h b/pvDataApp/misc/requester.h index d79fae4..9668866 100644 --- a/pvDataApp/misc/requester.h +++ b/pvDataApp/misc/requester.h @@ -7,8 +7,8 @@ #ifndef REQUESTER_H #define REQUESTER_H #include -#include "pvType.h" -#include "sharedPtr.h" +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/serialize.h b/pvDataApp/misc/serialize.h index 2c8ce97..37ef3e4 100644 --- a/pvDataApp/misc/serialize.h +++ b/pvDataApp/misc/serialize.h @@ -6,7 +6,7 @@ */ #ifndef SERIALIZE_H #define SERIALIZE_H -#include "byteBuffer.h" +#include namespace epics { namespace pvData { class SerializableControl; diff --git a/pvDataApp/misc/serializeHelper.cpp b/pvDataApp/misc/serializeHelper.cpp index f765417..f5cd29b 100644 --- a/pvDataApp/misc/serializeHelper.cpp +++ b/pvDataApp/misc/serializeHelper.cpp @@ -11,11 +11,11 @@ */ #include -#include +#include -#include "epicsException.h" -#include "byteBuffer.h" -#include "serializeHelper.h" +#include +#include +#include using namespace std; diff --git a/pvDataApp/misc/serializeHelper.h b/pvDataApp/misc/serializeHelper.h index c1e5a58..6dcdf42 100644 --- a/pvDataApp/misc/serializeHelper.h +++ b/pvDataApp/misc/serializeHelper.h @@ -13,10 +13,10 @@ #ifndef SERIALIZEHELPER_H_ #define SERIALIZEHELPER_H_ -#include "serialize.h" -#include "byteBuffer.h" -#include "noDefaultMethods.h" -#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/status.cpp b/pvDataApp/misc/status.cpp index 61a341d..09da59a 100644 --- a/pvDataApp/misc/status.cpp +++ b/pvDataApp/misc/status.cpp @@ -4,9 +4,9 @@ * EPICS pvDataCPP is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ -#include "status.h" -#include "epicsException.h" -#include "serializeHelper.h" +#include +#include +#include namespace epics { namespace pvData { @@ -132,4 +132,4 @@ void Status::toString(StringBuilder buffer, int indentLevel) const *buffer += ']'; } -}} \ No newline at end of file +}} diff --git a/pvDataApp/misc/status.h b/pvDataApp/misc/status.h index 75d4957..aee3848 100644 --- a/pvDataApp/misc/status.h +++ b/pvDataApp/misc/status.h @@ -7,8 +7,8 @@ #ifndef STATUS_H #define STATUS_H -#include "serialize.h" -#include "byteBuffer.h" +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/thread.h b/pvDataApp/misc/thread.h index 71110c3..dbbf5d0 100644 --- a/pvDataApp/misc/thread.h +++ b/pvDataApp/misc/thread.h @@ -7,8 +7,8 @@ #ifndef THREAD_H #define THREAD_H #include -#include "noDefaultMethods.h" -#include "pvType.h" +#include +#include #include diff --git a/pvDataApp/misc/timeFunction.cpp b/pvDataApp/misc/timeFunction.cpp index 3435f1d..98d5bcd 100644 --- a/pvDataApp/misc/timeFunction.cpp +++ b/pvDataApp/misc/timeFunction.cpp @@ -4,9 +4,9 @@ * EPICS pvDataCPP is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ -#include "noDefaultMethods.h" -#include "pvType.h" -#include "timeStamp.h" +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/timeFunction.h b/pvDataApp/misc/timeFunction.h index f9fcd8a..519f4ff 100644 --- a/pvDataApp/misc/timeFunction.h +++ b/pvDataApp/misc/timeFunction.h @@ -6,8 +6,8 @@ */ #ifndef TIMEFUNCTION_H #define TIMEFUNCTION_H -#include "noDefaultMethods.h" -#include "pvType.h" +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/timer.cpp b/pvDataApp/misc/timer.cpp index 4b278a7..521e458 100644 --- a/pvDataApp/misc/timer.cpp +++ b/pvDataApp/misc/timer.cpp @@ -11,15 +11,15 @@ #include #include -#include "pvType.h" -#include "lock.h" -#include "noDefaultMethods.h" -#include "CDRMonitor.h" -#include "linkedList.h" -#include "thread.h" -#include "timeStamp.h" -#include "timer.h" -#include "event.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/misc/timer.h b/pvDataApp/misc/timer.h index 4049c92..f4bda13 100644 --- a/pvDataApp/misc/timer.h +++ b/pvDataApp/misc/timer.h @@ -13,10 +13,10 @@ #include #include -#include "pvType.h" -#include "thread.h" -#include "noDefaultMethods.h" -#include "sharedPtr.h" +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/monitor/monitor.h b/pvDataApp/monitor/monitor.h index f1f4300..711b4f0 100644 --- a/pvDataApp/monitor/monitor.h +++ b/pvDataApp/monitor/monitor.h @@ -7,11 +7,11 @@ #ifndef MONITOR_H #define MONITOR_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/monitor/monitorQueue.cpp b/pvDataApp/monitor/monitorQueue.cpp index e383fd2..e6ed892 100644 --- a/pvDataApp/monitor/monitorQueue.cpp +++ b/pvDataApp/monitor/monitorQueue.cpp @@ -5,9 +5,9 @@ * in file LICENSE that is included with this distribution. */ /* Marty Kraimer 2011.03 */ -#include +#include -#include "monitorQueue.h" +#include namespace epics { namespace pvData { diff --git a/pvDataApp/monitor/monitorQueue.h b/pvDataApp/monitor/monitorQueue.h index 8d6ee47..83f874f 100644 --- a/pvDataApp/monitor/monitorQueue.h +++ b/pvDataApp/monitor/monitorQueue.h @@ -12,10 +12,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/property/alarm.cpp b/pvDataApp/property/alarm.cpp index 9d216b2..372a518 100644 --- a/pvDataApp/property/alarm.cpp +++ b/pvDataApp/property/alarm.cpp @@ -6,10 +6,10 @@ */ #include #include -#include "pvType.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "alarm.h" +#include +#include +#include +#include namespace epics { namespace pvData { static String severityNames[4] = diff --git a/pvDataApp/property/alarm.h b/pvDataApp/property/alarm.h index acaf8f7..cde8c41 100644 --- a/pvDataApp/property/alarm.h +++ b/pvDataApp/property/alarm.h @@ -5,7 +5,7 @@ * in file LICENSE that is included with this distribution. */ #include -#include "pvType.h" +#include #ifndef ALARM_H #define ALARM_H namespace epics { namespace pvData { diff --git a/pvDataApp/property/display.h b/pvDataApp/property/display.h index 15d34a2..64647bd 100644 --- a/pvDataApp/property/display.h +++ b/pvDataApp/property/display.h @@ -5,8 +5,8 @@ * in file LICENSE that is included with this distribution. */ #include -#include "pvType.h" -#include "pvData.h" +#include +#include #ifndef DISPLAY_H #define DISPLAY_H namespace epics { namespace pvData { diff --git a/pvDataApp/property/pvAlarm.cpp b/pvDataApp/property/pvAlarm.cpp index c9ef5a0..d88d869 100644 --- a/pvDataApp/property/pvAlarm.cpp +++ b/pvDataApp/property/pvAlarm.cpp @@ -6,10 +6,10 @@ */ #include #include -#include "pvType.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "pvAlarm.h" +#include +#include +#include +#include namespace epics { namespace pvData { static String noAlarmFound("No alarm structure found"); diff --git a/pvDataApp/property/pvAlarm.h b/pvDataApp/property/pvAlarm.h index 55101b3..0024b44 100644 --- a/pvDataApp/property/pvAlarm.h +++ b/pvDataApp/property/pvAlarm.h @@ -5,8 +5,8 @@ * in file LICENSE that is included with this distribution. */ #include -#include "pvType.h" -#include "alarm.h" +#include +#include #ifndef PVALARM_H #define PVALARM_H namespace epics { namespace pvData { diff --git a/pvDataApp/property/pvControl.cpp b/pvDataApp/property/pvControl.cpp index 47272b1..3196d50 100644 --- a/pvDataApp/property/pvControl.cpp +++ b/pvDataApp/property/pvControl.cpp @@ -6,10 +6,10 @@ */ #include #include -#include "pvType.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "pvControl.h" +#include +#include +#include +#include namespace epics { namespace pvData { static String noControlFound("No control structure found"); diff --git a/pvDataApp/property/pvControl.h b/pvDataApp/property/pvControl.h index 9e49481..530087e 100644 --- a/pvDataApp/property/pvControl.h +++ b/pvDataApp/property/pvControl.h @@ -4,8 +4,8 @@ * EPICS pvDataCPP is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ -#include "control.h" -#include "pvData.h" +#include +#include #ifndef PVCONTROL_H #define PVCONTROL_H namespace epics { namespace pvData { diff --git a/pvDataApp/property/pvDisplay.cpp b/pvDataApp/property/pvDisplay.cpp index 67d39f0..3903b5c 100644 --- a/pvDataApp/property/pvDisplay.cpp +++ b/pvDataApp/property/pvDisplay.cpp @@ -6,10 +6,10 @@ */ #include #include -#include "pvType.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "pvDisplay.h" +#include +#include +#include +#include namespace epics { namespace pvData { static String noDisplayFound("No display structure found"); diff --git a/pvDataApp/property/pvDisplay.h b/pvDataApp/property/pvDisplay.h index 8625a01..95b199e 100644 --- a/pvDataApp/property/pvDisplay.h +++ b/pvDataApp/property/pvDisplay.h @@ -5,9 +5,9 @@ * in file LICENSE that is included with this distribution. */ #include -#include "pvType.h" -#include "pvData.h" -#include "display.h" +#include +#include +#include #ifndef PVDISPLAY_H #define PVDISPLAY_H namespace epics { namespace pvData { diff --git a/pvDataApp/property/pvEnumerated.cpp b/pvDataApp/property/pvEnumerated.cpp index a071647..6e0e8fb 100644 --- a/pvDataApp/property/pvEnumerated.cpp +++ b/pvDataApp/property/pvEnumerated.cpp @@ -6,10 +6,10 @@ */ #include #include -#include "pvType.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "pvEnumerated.h" +#include +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/property/pvEnumerated.h b/pvDataApp/property/pvEnumerated.h index 45974e3..acd678b 100644 --- a/pvDataApp/property/pvEnumerated.h +++ b/pvDataApp/property/pvEnumerated.h @@ -5,8 +5,8 @@ * in file LICENSE that is included with this distribution. */ #include -#include "pvType.h" -#include "pvData.h" +#include +#include #ifndef PVENUMERATED_H #define PVENUMERATED_H namespace epics { namespace pvData { diff --git a/pvDataApp/property/pvTimeStamp.cpp b/pvDataApp/property/pvTimeStamp.cpp index 1e6d04f..7ddb697 100644 --- a/pvDataApp/property/pvTimeStamp.cpp +++ b/pvDataApp/property/pvTimeStamp.cpp @@ -6,10 +6,10 @@ */ #include #include -#include "pvType.h" -#include "timeStamp.h" -#include "pvData.h" -#include "pvTimeStamp.h" +#include +#include +#include +#include namespace epics { namespace pvData { static String noTimeStamp("No timeStamp structure found"); diff --git a/pvDataApp/property/pvTimeStamp.h b/pvDataApp/property/pvTimeStamp.h index 635df2b..3769f70 100644 --- a/pvDataApp/property/pvTimeStamp.h +++ b/pvDataApp/property/pvTimeStamp.h @@ -6,9 +6,9 @@ */ #include #include -#include "pvType.h" -#include "timeStamp.h" -#include "pvData.h" +#include +#include +#include #ifndef PVTIMESTAMP_H #define PVTIMESTAMP_H namespace epics { namespace pvData { diff --git a/pvDataApp/property/timeStamp.cpp b/pvDataApp/property/timeStamp.cpp index 064001e..5314656 100644 --- a/pvDataApp/property/timeStamp.cpp +++ b/pvDataApp/property/timeStamp.cpp @@ -11,9 +11,9 @@ #include #include -#include "noDefaultMethods.h" -#include "pvType.h" -#include "timeStamp.h" +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/property/timeStamp.h b/pvDataApp/property/timeStamp.h index 4398acc..e6d8334 100644 --- a/pvDataApp/property/timeStamp.h +++ b/pvDataApp/property/timeStamp.h @@ -8,7 +8,7 @@ #define TIMESTAMP_H #include #include "epicsTime.h" -#include "pvType.h" +#include namespace epics { namespace pvData { diff --git a/pvDataApp/pv/convert.h b/pvDataApp/pv/convert.h index 53c9878..b5f131c 100644 --- a/pvDataApp/pv/convert.h +++ b/pvDataApp/pv/convert.h @@ -9,8 +9,8 @@ #include #include -#include "pvIntrospect.h" -#include "pvData.h" +#include +#include #include namespace epics { namespace pvData { diff --git a/pvDataApp/pv/pvData.h b/pvDataApp/pv/pvData.h index 31b0b79..5d63128 100644 --- a/pvDataApp/pv/pvData.h +++ b/pvDataApp/pv/pvData.h @@ -8,12 +8,12 @@ #define PVDATA_H #include #include -#include "pvType.h" -#include "pvIntrospect.h" -#include "noDefaultMethods.h" -#include "requester.h" -#include "byteBuffer.h" -#include "serialize.h" +#include +#include +#include +#include +#include +#include namespace epics { namespace pvData { class PVAuxInfo; diff --git a/pvDataApp/pv/pvIntrospect.h b/pvDataApp/pv/pvIntrospect.h index 8fc7586..034ff61 100644 --- a/pvDataApp/pv/pvIntrospect.h +++ b/pvDataApp/pv/pvIntrospect.h @@ -9,9 +9,9 @@ #include #include -#include "noDefaultMethods.h" -#include "sharedPtr.h" -#include "pvType.h" +#include +#include +#include namespace epics { namespace pvData { class Field; diff --git a/pvDataApp/pv/standardField.h b/pvDataApp/pv/standardField.h index 5068407..adf073d 100644 --- a/pvDataApp/pv/standardField.h +++ b/pvDataApp/pv/standardField.h @@ -8,7 +8,7 @@ #define STANDARDFIELD_H #include #include -#include "pvIntrospect.h" +#include namespace epics { namespace pvData { diff --git a/pvDataApp/pv/standardPVField.h b/pvDataApp/pv/standardPVField.h index e6cafda..943c40b 100644 --- a/pvDataApp/pv/standardPVField.h +++ b/pvDataApp/pv/standardPVField.h @@ -8,8 +8,8 @@ #define STANDARDPVFIELD_H #include #include -#include "pvIntrospect.h" -#include "pvData.h" +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/pvMisc/bitSetUtil.cpp b/pvDataApp/pvMisc/bitSetUtil.cpp index e355e0e..00d3804 100644 --- a/pvDataApp/pvMisc/bitSetUtil.cpp +++ b/pvDataApp/pvMisc/bitSetUtil.cpp @@ -4,9 +4,9 @@ * EPICS pvDataCPP is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ -#include "noDefaultMethods.h" -#include "pvData.h" -#include "bitSetUtil.h" +#include +#include +#include namespace epics { namespace pvData { diff --git a/pvDataApp/pvMisc/bitSetUtil.h b/pvDataApp/pvMisc/bitSetUtil.h index f6f52ce..3032583 100644 --- a/pvDataApp/pvMisc/bitSetUtil.h +++ b/pvDataApp/pvMisc/bitSetUtil.h @@ -6,9 +6,9 @@ */ #ifndef BITSETUTIL_H #define BITSETUTIL_H -#include "noDefaultMethods.h" -#include "pvData.h" -#include "bitSet.h" +#include +#include +#include namespace epics { namespace pvData { diff --git a/test/testBaseException b/test/testBaseException index 0aee447..0de1968 100644 --- a/test/testBaseException +++ b/test/testBaseException @@ -5,7 +5,7 @@ There is a logic_error On line 68 of ../testBaseException.cpp ../bin/linux-x86/testBaseException[0x80497b9] ../bin/linux-x86/testBaseException[0x8049a54] -/lib/libc.so.6(__libc_start_main+0xe6)[0x3ede36] +/lib/libc.so.6(__libc_start_main+0xe6)[0x126e36] ../bin/linux-x86/testBaseException[0x80490e1] To translate run 'addr2line -e execname 0xXXXXXXX ...' Note: Must be compiled with debug symbols @@ -17,7 +17,7 @@ On line 75 of ../testBaseException.cpp ../bin/linux-x86/testBaseException() [0x8049cec] ../bin/linux-x86/testBaseException() [0x8049923] ../bin/linux-x86/testBaseException() [0x8049a54] -/lib/libc.so.6(__libc_start_main+0xe6) [0x3ede36] +/lib/libc.so.6(__libc_start_main+0xe6) [0x126e36] ../bin/linux-x86/testBaseException() [0x80490e1] testBaseException... @@ -26,7 +26,7 @@ all is OK On line 48 of ../testBaseException.cpp ../bin/linux-x86/testBaseException() [0x8049581] ../bin/linux-x86/testBaseException() [0x8049a5c] -/lib/libc.so.6(__libc_start_main+0xe6) [0x3ede36] +/lib/libc.so.6(__libc_start_main+0xe6) [0x126e36] ../bin/linux-x86/testBaseException() [0x80490e1] @@ -38,7 +38,7 @@ On line 57 of ../testBaseException.cpp ../bin/linux-x86/testBaseException() [0x80491ec] ../bin/linux-x86/testBaseException() [0x80496f9] ../bin/linux-x86/testBaseException() [0x8049a5c] -/lib/libc.so.6(__libc_start_main+0xe6) [0x3ede36] +/lib/libc.so.6(__libc_start_main+0xe6) [0x126e36] ../bin/linux-x86/testBaseException() [0x80490e1] diff --git a/test/testBaseException.sh b/test/testBaseException.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testBaseException.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testBaseException.sh b/test/testBaseException.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testBaseException.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testBaseExceptionDiff b/test/testBaseExceptionDiff index 404d981..7a7e2f2 100644 --- a/test/testBaseExceptionDiff +++ b/test/testBaseExceptionDiff @@ -1,5 +1,5 @@ --- testBaseExceptionGold 2011-04-27 13:11:55.000000000 -0400 -+++ testBaseException 2011-05-10 07:36:37.000000000 -0400 ++++ testBaseException 2011-06-07 07:20:29.000000000 -0400 @@ -1,37 +1,46 @@ + + @@ -8,7 +8,7 @@ +On line 68 of ../testBaseException.cpp +../bin/linux-x86/testBaseException[0x80497b9] +../bin/linux-x86/testBaseException[0x8049a54] -+/lib/libc.so.6(__libc_start_main+0xe6)[0x3ede36] ++/lib/libc.so.6(__libc_start_main+0xe6)[0x126e36] +../bin/linux-x86/testBaseException[0x80490e1] +To translate run 'addr2line -e execname 0xXXXXXXX ...' + Note: Must be compiled with debug symbols @@ -20,7 +20,7 @@ +../bin/linux-x86/testBaseException() [0x8049cec] +../bin/linux-x86/testBaseException() [0x8049923] +../bin/linux-x86/testBaseException() [0x8049a54] -+/lib/libc.so.6(__libc_start_main+0xe6) [0x3ede36] ++/lib/libc.so.6(__libc_start_main+0xe6) [0x126e36] +../bin/linux-x86/testBaseException() [0x80490e1] + testBaseException... @@ -34,7 +34,7 @@ +On line 48 of ../testBaseException.cpp +../bin/linux-x86/testBaseException() [0x8049581] +../bin/linux-x86/testBaseException() [0x8049a5c] -+/lib/libc.so.6(__libc_start_main+0xe6) [0x3ede36] ++/lib/libc.so.6(__libc_start_main+0xe6) [0x126e36] +../bin/linux-x86/testBaseException() [0x80490e1] + @@ -67,7 +67,7 @@ +../bin/linux-x86/testBaseException() [0x80491ec] +../bin/linux-x86/testBaseException() [0x80496f9] +../bin/linux-x86/testBaseException() [0x8049a5c] -+/lib/libc.so.6(__libc_start_main+0xe6) [0x3ede36] ++/lib/libc.so.6(__libc_start_main+0xe6) [0x126e36] +../bin/linux-x86/testBaseException() [0x80490e1] + diff --git a/test/testBitSet.sh b/test/testBitSet.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testBitSet.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testBitSet.sh b/test/testBitSet.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testBitSet.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testByteBuffer.sh b/test/testByteBuffer.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testByteBuffer.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testByteBuffer.sh b/test/testByteBuffer.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testByteBuffer.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testIntrospect.sh b/test/testIntrospect.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testIntrospect.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testIntrospect.sh b/test/testIntrospect.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testIntrospect.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testLinkedList.sh b/test/testLinkedList.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testLinkedList.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testLinkedList.sh b/test/testLinkedList.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testLinkedList.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testLinkedListAux b/test/testLinkedListAux index fb4614a..acd2038 100644 --- a/test/testLinkedListAux +++ b/test/testLinkedListAux @@ -1,20 +1,20 @@ Time test -diff 23.025222 milliSeconds -time per iteration 23.025222 microseconds -time per addTail/removeHead 0.011513 microseconds +diff 22.284825 milliSeconds +time per iteration 22.284825 microseconds +time per addTail/removeHead 0.011142 microseconds Time test locked -diff 221.055746 milliSeconds -time per iteration 221.055746 microseconds -time per addTail/removeHead 0.110528 microseconds +diff 204.476572 milliSeconds +time per iteration 204.476572 microseconds +time per addTail/removeHead 0.102238 microseconds Time std::list test -diff 658.326477 milliSeconds -time per iteration 658.326477 microseconds -time per addTail/removeHead 0.329163 microseconds +diff 629.578567 milliSeconds +time per iteration 629.578567 microseconds +time per addTail/removeHead 0.314789 microseconds Time std::list test locked -diff 825.914024 milliSeconds -time per iteration 825.914024 microseconds -time per addTail/removeHead 0.412957 microseconds +diff 784.572710 milliSeconds +time per iteration 784.572710 microseconds +time per addTail/removeHead 0.392286 microseconds diff --git a/test/testMessageQueue.sh b/test/testMessageQueue.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testMessageQueue.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testMessageQueue.sh b/test/testMessageQueue.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testMessageQueue.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testPVAppend.sh b/test/testPVAppend.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testPVAppend.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testPVAppend.sh b/test/testPVAppend.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testPVAppend.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testPVAuxInfo.sh b/test/testPVAuxInfo.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testPVAuxInfo.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testPVAuxInfo.sh b/test/testPVAuxInfo.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testPVAuxInfo.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testPVData.sh b/test/testPVData.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testPVData.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testPVData.sh b/test/testPVData.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testPVData.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testPVStructureArray.sh b/test/testPVStructureArray.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testPVStructureArray.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testPVStructureArray.sh b/test/testPVStructureArray.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testPVStructureArray.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testProperty.sh b/test/testProperty.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testProperty.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testProperty.sh b/test/testProperty.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testProperty.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testPropertyAux b/test/testPropertyAux index a3dcd7b..325873e 100644 --- a/test/testPropertyAux +++ b/test/testPropertyAux @@ -1 +1 @@ -2011.05.10 07:36:42 565871670 nanoSeconds isDst true +2011.06.07 07:20:33 714092060 nanoSeconds isDst true diff --git a/test/testQueue.sh b/test/testQueue.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testQueue.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testQueue.sh b/test/testQueue.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testQueue.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testSerialization.sh b/test/testSerialization.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testSerialization.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testSerialization.sh b/test/testSerialization.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testSerialization.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testThread.sh b/test/testThread.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testThread.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testThread.sh b/test/testThread.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testThread.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testThreadAux b/test/testThreadAux index afcc880..ba16c6e 100644 --- a/test/testThreadAux +++ b/test/testThreadAux @@ -1 +1 @@ -time per call 0.007801 microseconds +time per call 0.007466 microseconds diff --git a/test/testTimeStamp.sh b/test/testTimeStamp.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testTimeStamp.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testTimeStamp.sh b/test/testTimeStamp.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testTimeStamp.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testTimeStampAux b/test/testTimeStampAux index 05c5ce3..aee1b02 100644 --- a/test/testTimeStampAux +++ b/test/testTimeStampAux @@ -1,5 +1,5 @@ -current 1305027401 678184290 milliSec 1305027401678 -2011.05.10 07:36:41 678184290 nanoSeconds isDst true +current 1307445632 825675237 milliSec 1307445632825 +2011.06.07 07:20:32 825675237 nanoSeconds isDst true fromTime_t -current 1305027401 0 milliSec 1305027401000 -2011.05.10 07:36:41 0 nanoSeconds isDst true +current 1307445632 0 milliSec 1307445632000 +2011.06.07 07:20:32 0 nanoSeconds isDst true diff --git a/test/testTimer.sh b/test/testTimer.sh deleted file mode 120000 index 2dcdfc4..0000000 --- a/test/testTimer.sh +++ /dev/null @@ -1 +0,0 @@ -testPVType.sh \ No newline at end of file diff --git a/test/testTimer.sh b/test/testTimer.sh new file mode 100755 index 0000000..5d1254b --- /dev/null +++ b/test/testTimer.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +SELF="`basename "$0"`" +TEST="${SELF%.sh}" + +if [ -z "$EPICS_HOST_ARCH" ]; then + echo "Please set EPICS_HOST_ARCH and run again" + exit 1 +fi + +rm -f $TEST ${TEST}Diff ${TEST}Aux + +if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null +then + printf "" # OK +else + printf "$TEST Failed to complete\n" +fi + +if [ -e $TEST -a -e ${TEST}Gold ] +then + diff -u ${TEST}Gold $TEST >> ${TEST}Diff + if [ -s "${TEST}Diff" ] + then + printf "$TEST Does not match expectations\n" + cat ${TEST}Diff + printf "\n\n" + else + printf "$TEST OK\n" + fi +else + printf "$TEST OK\n" +fi diff --git a/test/testTimerAux b/test/testTimerAux index ddd9f7d..455b33a 100644 --- a/test/testTimerAux +++ b/test/testTimerAux @@ -1,6 +1,6 @@ -one requested 0.400000 diff 0.400284 seconds -two requested 0.200000 diff 0.200202 seconds -one requested 0.200000 diff 0.200283 seconds -two requested 0.400000 diff 0.400290 seconds -one requested 0.000000 diff 0.000034 seconds -two requested 0.000000 diff 0.000049 seconds +one requested 0.400000 diff 0.400240 seconds +two requested 0.200000 diff 0.200201 seconds +one requested 0.200000 diff 0.200203 seconds +two requested 0.400000 diff 0.400185 seconds +one requested 0.000000 diff 0.000028 seconds +two requested 0.000000 diff 0.000075 seconds diff --git a/testApp/misc/testBaseException.cpp b/testApp/misc/testBaseException.cpp index f9b2587..6c0d3fb 100644 --- a/testApp/misc/testBaseException.cpp +++ b/testApp/misc/testBaseException.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "epicsException.h" +#include #include diff --git a/testApp/misc/testBitSet.cpp b/testApp/misc/testBitSet.cpp index ed17ea1..45447f2 100644 --- a/testApp/misc/testBitSet.cpp +++ b/testApp/misc/testBitSet.cpp @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/testApp/misc/testByteBuffer.cpp b/testApp/misc/testByteBuffer.cpp index 7bdddce..1badc0e 100644 --- a/testApp/misc/testByteBuffer.cpp +++ b/testApp/misc/testByteBuffer.cpp @@ -17,8 +17,8 @@ #include #include -#include "byteBuffer.h" -#include "pvIntrospect.h" +#include +#include using namespace epics::pvData; diff --git a/testApp/misc/testLinkedList.cpp b/testApp/misc/testLinkedList.cpp index 5cc87bc..c97c8af 100644 --- a/testApp/misc/testLinkedList.cpp +++ b/testApp/misc/testLinkedList.cpp @@ -20,10 +20,10 @@ #include #include -#include "lock.h" -#include "timeStamp.h" -#include "linkedList.h" -#include "CDRMonitor.h" +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/misc/testMessageQueue.cpp b/testApp/misc/testMessageQueue.cpp index 93e2e2f..5d14653 100644 --- a/testApp/misc/testMessageQueue.cpp +++ b/testApp/misc/testMessageQueue.cpp @@ -19,14 +19,14 @@ #include #include -#include "lock.h" -#include "timeStamp.h" -#include "requester.h" -#include "messageQueue.h" -#include "CDRMonitor.h" -#include "event.h" -#include "thread.h" -#include "executor.h" +#include +#include +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/misc/testQueue.cpp b/testApp/misc/testQueue.cpp index 513d043..c98363a 100644 --- a/testApp/misc/testQueue.cpp +++ b/testApp/misc/testQueue.cpp @@ -19,13 +19,13 @@ #include #include -#include "lock.h" -#include "timeStamp.h" -#include "queue.h" -#include "CDRMonitor.h" -#include "event.h" -#include "thread.h" -#include "executor.h" +#include +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/misc/testSerialization.cpp b/testApp/misc/testSerialization.cpp index 7cf31d0..806b07e 100644 --- a/testApp/misc/testSerialization.cpp +++ b/testApp/misc/testSerialization.cpp @@ -15,13 +15,13 @@ #include #include -#include "pvIntrospect.h" -#include "pvData.h" -#include "serialize.h" -#include "noDefaultMethods.h" -#include "byteBuffer.h" -#include "CDRMonitor.h" -#include "convert.h" +#include +#include +#include +#include +#include +#include +#include #define BYTE_MAX_VALUE 127 #define BYTE_MIN_VALUE -128 diff --git a/testApp/misc/testThread.cpp b/testApp/misc/testThread.cpp index 9950e73..c5d1593 100644 --- a/testApp/misc/testThread.cpp +++ b/testApp/misc/testThread.cpp @@ -20,11 +20,11 @@ #include #include -#include "event.h" -#include "thread.h" -#include "executor.h" -#include "CDRMonitor.h" -#include "timeFunction.h" +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/misc/testTimeStamp.cpp b/testApp/misc/testTimeStamp.cpp index c148284..edb0b27 100644 --- a/testApp/misc/testTimeStamp.cpp +++ b/testApp/misc/testTimeStamp.cpp @@ -21,7 +21,7 @@ #include -#include "timeStamp.h" +#include using namespace epics::pvData; diff --git a/testApp/misc/testTimer.cpp b/testApp/misc/testTimer.cpp index 1ebb78d..bea28dd 100644 --- a/testApp/misc/testTimer.cpp +++ b/testApp/misc/testTimer.cpp @@ -18,11 +18,11 @@ #include #include -#include "timeStamp.h" -#include "event.h" -#include "timer.h" -#include "thread.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/property/testProperty.cpp b/testApp/property/testProperty.cpp index 7030c0e..785bae2 100644 --- a/testApp/property/testProperty.cpp +++ b/testApp/property/testProperty.cpp @@ -16,22 +16,22 @@ #include #include -#include "requester.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "convert.h" -#include "standardField.h" -#include "standardPVField.h" -#include "alarm.h" -#include "control.h" -#include "display.h" -#include "timeStamp.h" -#include "pvAlarm.h" -#include "pvControl.h" -#include "pvDisplay.h" -#include "pvEnumerated.h" -#include "pvTimeStamp.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/pv/temp.cpp b/testApp/pv/temp.cpp index 3cd1667..1420d0a 100644 --- a/testApp/pv/temp.cpp +++ b/testApp/pv/temp.cpp @@ -15,13 +15,13 @@ #include #include -#include "requester.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "convert.h" -#include "standardField.h" -#include "standardPVField.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/pv/testIntrospect.cpp b/testApp/pv/testIntrospect.cpp index e8b0636..a17f48e 100644 --- a/testApp/pv/testIntrospect.cpp +++ b/testApp/pv/testIntrospect.cpp @@ -15,12 +15,12 @@ #include #include -#include "requester.h" -#include "executor.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "standardField.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/pv/testPVAppend.cpp b/testApp/pv/testPVAppend.cpp index 9626f09..25e1d2f 100644 --- a/testApp/pv/testPVAppend.cpp +++ b/testApp/pv/testPVAppend.cpp @@ -15,13 +15,13 @@ #include #include -#include "requester.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "convert.h" -#include "standardField.h" -#include "standardPVField.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/pv/testPVAuxInfo.cpp b/testApp/pv/testPVAuxInfo.cpp index 40f3bff..da0b100 100644 --- a/testApp/pv/testPVAuxInfo.cpp +++ b/testApp/pv/testPVAuxInfo.cpp @@ -15,13 +15,13 @@ #include #include -#include "requester.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "convert.h" -#include "standardField.h" -#include "standardPVField.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/pv/testPVData.cpp b/testApp/pv/testPVData.cpp index 8ff9ca8..e169602 100644 --- a/testApp/pv/testPVData.cpp +++ b/testApp/pv/testPVData.cpp @@ -15,13 +15,13 @@ #include #include -#include "requester.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "convert.h" -#include "standardField.h" -#include "standardPVField.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/pv/testPVStructureArray.cpp b/testApp/pv/testPVStructureArray.cpp index 94464d6..afd211b 100644 --- a/testApp/pv/testPVStructureArray.cpp +++ b/testApp/pv/testPVStructureArray.cpp @@ -15,12 +15,12 @@ #include #include -#include "requester.h" -#include "pvIntrospect.h" -#include "pvData.h" -#include "standardField.h" -#include "standardPVField.h" -#include "CDRMonitor.h" +#include +#include +#include +#include +#include +#include using namespace epics::pvData; diff --git a/testApp/pv/testPVType.cpp b/testApp/pv/testPVType.cpp index 9706b77..cb73267 100644 --- a/testApp/pv/testPVType.cpp +++ b/testApp/pv/testPVType.cpp @@ -14,8 +14,8 @@ #include -#include "requester.h" -#include "pvType.h" +#include +#include using namespace epics::pvData;