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
+3 -3
View File
@@ -229,7 +229,7 @@ public:
virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false,
bool verbose=false, const char* fieldName=NULL, char fieldIndex=-1,
bool verbose=false, const char* fieldName=NULL, signed char fieldIndex=-1,
char separator=UI_FIELD_SEPARATOR) = 0;
/**
@@ -321,7 +321,7 @@ public:
virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false,
bool verbose=false, const char* fieldName=NULL, char fieldIndex=-1,
bool verbose=false, const char* fieldName=NULL, signed char fieldIndex=-1,
char separator=UI_FIELD_SEPARATOR);
// @copydoc
@@ -653,7 +653,7 @@ public:
virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false,
bool verbose=false, const char* fieldName=NULL, char fieldIndex=-1,
bool verbose=false, const char* fieldName=NULL, signed char fieldIndex=-1,
char separator=UI_FIELD_SEPARATOR);
// @copydoc