Merge branch 'master' of github.com:john30/ebusd

This commit is contained in:
john30
2015-03-07 12:13:11 +01:00
4 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -447,7 +447,7 @@ void SingleDataField::dump(ostream& output)
result_t SingleDataField::read(const PartType partType,
SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator,
bool verbose, const char* fieldName, char fieldIndex,
bool verbose, const char* fieldName, signed char fieldIndex,
char separator)
{
if (partType != m_partType)
@@ -1255,7 +1255,7 @@ void DataFieldSet::dump(ostream& output)
result_t DataFieldSet::read(const PartType partType,
SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator,
bool verbose, const char* fieldName, char fieldIndex,
bool verbose, const char* fieldName, signed char fieldIndex,
char separator)
{
bool previousFullByteOffset = true, found = false, findFieldIndex = fieldName != NULL && fieldIndex >= 0;