diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-04-26 19:44:29 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-04-26 19:44:29 (GMT) |
| commit | 33a817259588101ba9d4bcab8e73d3fe1759a196 (patch) | |
| tree | c7612c5ee34694d57e5b4fc758018507541cb22e | |
| parent | 2b9e5d72a31c5060a443a0535d2d139326c51f04 (diff) | |
| download | uscxml-33a817259588101ba9d4bcab8e73d3fe1759a196.zip uscxml-33a817259588101ba9d4bcab8e73d3fe1759a196.tar.gz uscxml-33a817259588101ba9d4bcab8e73d3fe1759a196.tar.bz2 | |
Fixed issue113
| -rw-r--r-- | src/uscxml/interpreter/BasicContentExecutor.cpp | 6 | ||||
| -rw-r--r-- | src/uscxml/interpreter/StdOutLogger.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp index 17dd611..820a945 100644 --- a/src/uscxml/interpreter/BasicContentExecutor.cpp +++ b/src/uscxml/interpreter/BasicContentExecutor.cpp @@ -276,10 +276,16 @@ void BasicContentExecutor::processLog(XERCESC_NS::DOMElement* content) { std::string expr = ATTR(content, kXMLCharExpr); Data d = _callbacks->evalAsData(expr); +#if 1 if (label.size() > 0) { _callbacks->getLogger().log(USCXML_LOG) << label << ": "; } _callbacks->getLogger().log(USCXML_LOG) << d << std::endl; +#else + // see issue113 + _callbacks->getLogger().log(USCXML_LOG) << (label.size() > 0 ? label + ":" : "") << d << std::endl; +#endif + } void BasicContentExecutor::processScript(XERCESC_NS::DOMElement* content) { diff --git a/src/uscxml/interpreter/StdOutLogger.cpp b/src/uscxml/interpreter/StdOutLogger.cpp index 3f954d6..76a2169 100644 --- a/src/uscxml/interpreter/StdOutLogger.cpp +++ b/src/uscxml/interpreter/StdOutLogger.cpp @@ -27,15 +27,15 @@ std::shared_ptr<LoggerImpl> StdOutLogger::create() { } void StdOutLogger::log(LogSeverity severity, const std::string& message) { - std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << message << std::endl; + std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << message << std::flush; } void StdOutLogger::log(LogSeverity severity, const Event& event) { - std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << event << std::endl; + std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << event << std::flush; } void StdOutLogger::log(LogSeverity severity, const Data& data) { - std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << data << std::endl; + std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << data << std::flush; } } |