diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-05-14 13:11:10 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-05-14 13:11:10 (GMT) |
| commit | 3e099d9fa8780a1206f2bb0a285241f156fa5138 (patch) | |
| tree | 9d4b9a53f6dae4fb8c36af96e36926195d9c0ebf /src/uscxml/plugins | |
| parent | 9b5bc11d60dd6d111661ce4aa37725046071cf6e (diff) | |
| download | uscxml-3e099d9fa8780a1206f2bb0a285241f156fa5138.zip uscxml-3e099d9fa8780a1206f2bb0a285241f156fa5138.tar.gz uscxml-3e099d9fa8780a1206f2bb0a285241f156fa5138.tar.bz2 | |
Various bug fixes
Diffstat (limited to 'src/uscxml/plugins')
| -rw-r--r-- | src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp | 10 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp index 124da6e..4203305 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp @@ -778,7 +778,7 @@ void JSCDataModel::handleException(JSValueRef exception) { buffer.resize(maxSize); JSStringGetUTF8CString(exceptionStringRef, &buffer[0], maxSize); JSStringRelease(exceptionStringRef); - std::string exceptionMsg(buffer); + std::string exceptionMsg(buffer.c_str()); ERROR_EXECUTION_THROW(exceptionMsg); } @@ -842,7 +842,7 @@ bool JSCDataModel::jsIOProcessorHasProp(JSContextRef ctx, JSObjectRef object, JS std::string buffer; buffer.resize(maxSize); JSStringGetUTF8CString(propertyName, &buffer[0], maxSize); - std::string prop(buffer); + std::string prop(buffer.c_str()); return ioProcessors.find(prop) != ioProcessors.end(); } @@ -856,7 +856,7 @@ JSValueRef JSCDataModel::jsIOProcessorGetProp(JSContextRef ctx, JSObjectRef obje std::string buffer; buffer.resize(maxSize); JSStringGetUTF8CString(propertyName, &buffer[0], maxSize); - std::string prop(buffer); + std::string prop(buffer.c_str()); if (ioProcessors.find(prop) != ioProcessors.end()) { return INSTANCE->getDataAsValue(ioProcessors.find(prop)->second.getDataModelVariables()); @@ -886,7 +886,7 @@ bool JSCDataModel::jsInvokerHasProp(JSContextRef ctx, JSObjectRef object, JSStri std::string buffer; buffer.resize(maxSize); JSStringGetUTF8CString(propertyName, &buffer[0], maxSize); - std::string prop(buffer); + std::string prop(buffer.c_str()); return invokers.find(prop) != invokers.end(); } @@ -900,7 +900,7 @@ JSValueRef JSCDataModel::jsInvokerGetProp(JSContextRef ctx, JSObjectRef object, std::string buffer; buffer.resize(maxSize); JSStringGetUTF8CString(propertyName, &buffer[0], maxSize); - std::string prop(buffer); + std::string prop(buffer.c_str()); if (invokers.find(prop) != invokers.end()) { return INSTANCE->getDataAsValue(invokers.find(prop)->second.getDataModelVariables()); diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp index a764c82..0518a0e 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp @@ -409,11 +409,11 @@ void PromelaDataModel::setEvent(const Event& event) { case PML_NAME: { Data d = getVariable(node); if (d.atom.size() != 0) - // fixes issue 127 - if (isNumeric(d.atom.c_str(), 10)) { - return Data(d.atom, Data::VERBATIM); - } - return Data(d.asJSON(), Data::VERBATIM); + // fixes issue 127 + if (isNumeric(d.atom.c_str(), 10)) { + return Data(d.atom, Data::VERBATIM); + } + return Data(d.asJSON(), Data::VERBATIM); if (d.type == Data::INTERPRETED && d.atom[0] == '\'' && d.atom[d.atom.size() - 1] == '\'') return Data(d.atom.substr(1, d.atom.size() - 2), Data::VERBATIM); return d; |