merge

2012-09-03 23:46:06 +02:00
parent 516518529c 6b4eb1a1b0
commit cfc9ebefb0
94 changed files with 409 additions and 100 deletions
--- 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 <pv/bitSet.h>
--- 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 <stdexcept>
--- 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
+ */
--- 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

--- 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

--- 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 <pv/epicsException.h>

--- 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.
 */
 /*
--- 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 <cstddef>
 #include <cstdlib>
 #include <cstddef>
--- 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 <memory>
--- 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 <cstddef>
 #include <cstdlib>
 #include <cstddef>
--- 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 <memory>
--- 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 <stdexcept>
--- 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 <string>
 #include <pv/messageQueue.h>
 namespace epics { namespace pvData { 
--- 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 <memory>
--- 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 { 
--- 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 <vector>
 #include <tr1/memory>
 #include <cstddef>
--- 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 <string>
 #include <cstdio>
 #include <pv/lock.h>
--- 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 <string>
--- 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 <pv/byteBuffer.h>
--- 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.
 */
 /*
--- 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.
 */
 /*
--- 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
--- 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 <pv/status.h>
 #include <pv/epicsException.h>
 #include <pv/serializeHelper.h>
--- 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

--- 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 <memory>
--- 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 <cstddef>
 #include <cstdlib>
 #include <cstddef>
--- 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 <pv/sharedPtr.h>
--- 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 <stddef.h>
 #include <stdlib.h>
 #include <stddef.h>
--- 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 <memory>