From 5ac7ff3d6d329deedf2544658e9d346d96748b94 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 18 Oct 2015 10:17:43 +0200 Subject: [PATCH] allow subclasses to use m_lastError --- src/ebusd/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp index fbc5aa7d..45265c16 100644 --- a/src/ebusd/main.cpp +++ b/src/ebusd/main.cpp @@ -534,10 +534,9 @@ result_t loadConfigFiles(DataFieldTemplates* templates, MessageMap* messages, bo else logError(lf_main, "error reading config files: %s, %s", getResultCode(result), messages->getLastError().c_str()); - string error; - result = messages->resolveConditions(error, verbose); + result = messages->resolveConditions(verbose); if (result != RESULT_OK) - logError(lf_main, "error resolving conditions: %s, %s", getResultCode(result), error.c_str()); + logError(lf_main, "error resolving conditions: %s, %s", getResultCode(result), messages->getLastError().c_str()); logNotice(lf_main, "found messages: %d (%d conditional on %d conditions, %d poll, %d update)", messages->size(), messages->sizeConditional(), messages->sizeConditions(), messages->sizePoll(), messages->sizePassive());