diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-08-13 12:24:51 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-08-13 12:24:51 (GMT) |
| commit | d35b69b97dead2e50dda697f0fb0d5e574bbf205 (patch) | |
| tree | 6eac5b09bdc23b3aeb478779a7a25f5caf0f3568 /src/uscxml/Factory.cpp | |
| parent | 459f406eb2a36d393bd3a2b6aa3d63d86eb99c07 (diff) | |
| download | uscxml-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/Factory.cpp')
| -rw-r--r-- | src/uscxml/Factory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp index 21e820a..22d6008 100644 --- a/src/uscxml/Factory.cpp +++ b/src/uscxml/Factory.cpp @@ -491,7 +491,7 @@ void EventHandlerImpl::returnErrorExecution(const std::string& cause) { Event exceptionEvent; exceptionEvent.data.compound["exception"] = Data(cause, Data::VERBATIM); exceptionEvent.name = "error.execution"; - exceptionEvent.type = Event::PLATFORM; + exceptionEvent.eventType = Event::PLATFORM; returnEvent(exceptionEvent); } @@ -499,15 +499,15 @@ void EventHandlerImpl::returnErrorPlatform(const std::string& cause) { Event exceptionEvent; exceptionEvent.data.compound["exception"] = Data(cause, Data::VERBATIM); exceptionEvent.name = "error.platform"; - exceptionEvent.type = Event::PLATFORM; + exceptionEvent.eventType = Event::PLATFORM; returnEvent(exceptionEvent); } void EventHandlerImpl::returnEvent(Event& event) { if (event.invokeid.length() == 0) event.invokeid = _invokeId; - if (event.type == 0) - event.type = Event::EXTERNAL; + if (event.eventType == 0) + event.eventType = Event::EXTERNAL; if (event.origin.length() == 0) event.origin = "#_" + _invokeId; if (event.origintype.length() == 0) |