fixed compiler warnings
This commit is contained in:
@@ -127,7 +127,7 @@ void appendJson(ostringstream& output, const string name, const string value, bo
|
|||||||
if (!plain) {
|
if (!plain) {
|
||||||
const char* str = value.c_str();
|
const char* str = value.c_str();
|
||||||
char* strEnd = NULL;
|
char* strEnd = NULL;
|
||||||
double dvalue = strtod(str, &strEnd);
|
strtod(str, &strEnd);
|
||||||
plain = strEnd && *strEnd;
|
plain = strEnd && *strEnd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -170,11 +170,11 @@ Message::Message(const string circuit, const string level, const string name,
|
|||||||
: AttributedItem(name, attributes), m_circuit(circuit), m_level(level), m_isWrite(isWrite),
|
: AttributedItem(name, attributes), m_circuit(circuit), m_level(level), m_isWrite(isWrite),
|
||||||
m_isPassive(isPassive),
|
m_isPassive(isPassive),
|
||||||
m_srcAddress(srcAddress), m_dstAddress(dstAddress),
|
m_srcAddress(srcAddress), m_dstAddress(dstAddress),
|
||||||
m_id(id), m_data(data), m_deleteData(deleteData),
|
m_id(id), m_key(createKey(id, isWrite, isPassive, srcAddress, dstAddress)),
|
||||||
|
m_data(data), m_deleteData(deleteData),
|
||||||
m_pollPriority(pollPriority),
|
m_pollPriority(pollPriority),
|
||||||
m_usedByCondition(false), m_isScanMessage(false), m_condition(condition),
|
m_usedByCondition(false), m_isScanMessage(false), m_condition(condition),
|
||||||
m_lastUpdateTime(0), m_lastChangeTime(0), m_pollCount(0), m_lastPollTime(0),
|
m_lastUpdateTime(0), m_lastChangeTime(0), m_pollCount(0), m_lastPollTime(0) {
|
||||||
m_key(createKey(id, isWrite, isPassive, srcAddress, dstAddress)) {
|
|
||||||
if (circuit == "scan") {
|
if (circuit == "scan") {
|
||||||
setScanMessage();
|
setScanMessage();
|
||||||
m_pollPriority = 0;
|
m_pollPriority = 0;
|
||||||
@@ -781,7 +781,6 @@ result_t Message::storeLastData(SlaveSymbolString& data, size_t index) {
|
|||||||
if (data != m_lastSlaveData) {
|
if (data != m_lastSlaveData) {
|
||||||
m_lastChangeTime = m_lastUpdateTime;
|
m_lastChangeTime = m_lastUpdateTime;
|
||||||
m_lastSlaveData = data;
|
m_lastSlaveData = data;
|
||||||
const SlaveSymbolString& chk = getLastSlaveData();
|
|
||||||
}
|
}
|
||||||
return RESULT_OK;
|
return RESULT_OK;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -612,9 +612,6 @@ class Message : public AttributedItem {
|
|||||||
* false if message can be initiated by any participant. */
|
* false if message can be initiated by any participant. */
|
||||||
const bool m_isPassive;
|
const bool m_isPassive;
|
||||||
|
|
||||||
/** the additional named attributes. */
|
|
||||||
const map<string, string> m_attributes;
|
|
||||||
|
|
||||||
/** the source address, or @a SYN for any (only relevant if passive). */
|
/** the source address, or @a SYN for any (only relevant if passive). */
|
||||||
const symbol_t m_srcAddress;
|
const symbol_t m_srcAddress;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user