summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/ioprocessor
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-08-13 12:24:51 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-08-13 12:24:51 (GMT)
commitd35b69b97dead2e50dda697f0fb0d5e574bbf205 (patch)
tree6eac5b09bdc23b3aeb478779a7a25f5caf0f3568 /src/uscxml/plugins/ioprocessor
parent459f406eb2a36d393bd3a2b6aa3d63d86eb99c07 (diff)
downloaduscxml-d35b69b97dead2e50dda697f0fb0d5e574bbf205.zip
uscxml-d35b69b97dead2e50dda697f0fb0d5e574bbf205.tar.gz
uscxml-d35b69b97dead2e50dda697f0fb0d5e574bbf205.tar.bz2
Renamed event.type to eventType to avoid clash with send.type and invoker.type
Diffstat (limited to 'src/uscxml/plugins/ioprocessor')
-rw-r--r--src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp2
-rw-r--r--src/uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
index a612ee6..56e2523 100644
--- a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
+++ b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
@@ -70,7 +70,7 @@ Data BasicHTTPIOProcessor::getDataModelVariables() {
bool BasicHTTPIOProcessor::httpRecvRequest(const HTTPServer::Request& req) {
Event reqEvent = req;
- reqEvent.type = Event::EXTERNAL;
+ reqEvent.eventType = Event::EXTERNAL;
bool scxmlStructFound = false;
if (reqEvent.data.compound["header"].compound.find("Content-Type") != reqEvent.data.compound["header"].compound.end() &&
diff --git a/src/uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.cpp
index 25e0f8c..67b518c 100644
--- a/src/uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.cpp
+++ b/src/uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.cpp
@@ -39,7 +39,7 @@ boost::shared_ptr<IOProcessorImpl> MMIHTTPIOProcessor::create(InterpreterImpl* i
bool MMIHTTPIOProcessor::httpRecvRequest(const HTTPServer::Request& req) {
Event reqEvent = req;
- reqEvent.type = Event::EXTERNAL;
+ reqEvent.eventType = Event::EXTERNAL;
bool scxmlStructFound = false;
if (reqEvent.data.compound["header"].compound.find("Content-Type") != reqEvent.data.compound["header"].compound.end() &&