version bump, fixed ackAny > queueSize bug

This commit is contained in:
Matej Sekoranja
2015-12-16 10:17:56 +01:00
parent 0f87b082a3
commit 8fa82897e1
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -25,8 +25,8 @@
// module version
// TODO to be generated, etc.
#define EPICS_PVA_MAJOR_VERSION 4
#define EPICS_PVA_MINOR_VERSION 1
#define EPICS_PVA_MAINTENANCE_VERSION 2
#define EPICS_PVA_MINOR_VERSION 2
#define EPICS_PVA_MAINTENANCE_VERSION 0
#define EPICS_PVA_DEVELOPMENT_FLAG 1
namespace epics {
+1 -1
View File
@@ -2431,7 +2431,7 @@ namespace epics {
ss << pvString->get();
ss >> size;
if (size > 0)
m_ackAny = size;
m_ackAny = (m_ackAny <= m_queueSize) ? size : m_queueSize;
}
}
}