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/plugins/invoker/umundo/UmundoInvoker.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/plugins/invoker/umundo/UmundoInvoker.cpp')
| -rw-r--r-- | src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp index a70be38..de5a580 100644 --- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp +++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp @@ -94,7 +94,7 @@ void UmundoInvoker::send(const SendRequest& req) { event.name = _invokeId + ".reply." + req.name; event.origin = msg.getMeta("um.channel"); event.origintype = "umundo"; - event.type = Event::EXTERNAL; + event.eventType = Event::EXTERNAL; returnEvent(event); svcIter++; @@ -230,7 +230,7 @@ void UmundoInvoker::receive(void* object, umundo::Message* msg) { event.invokeid = _invokeId; event.origin = msg->getMeta("um.channel"); event.origintype = "umundo"; - event.type = Event::EXTERNAL; + event.eventType = Event::EXTERNAL; // if (msg->getMeta().find("um.s11n.type") != msg->getMeta().end()) // event.compound["class"] = msg->getMeta("um.s11n.type"); @@ -268,7 +268,7 @@ void UmundoInvoker::added(umundo::ServiceDescription desc) { addedEvent.invokeid = _invokeId; addedEvent.origin = desc.getName(); addedEvent.origintype = "umundo"; - addedEvent.type = Event::EXTERNAL; + addedEvent.eventType = Event::EXTERNAL; addedEvent.name = _invokeId + ".added"; std::map<std::string, std::string>::const_iterator propIter = desc.getProperties().begin(); @@ -294,7 +294,7 @@ void UmundoInvoker::removed(umundo::ServiceDescription desc) { addedEvent.invokeid = _invokeId; addedEvent.origin = desc.getName(); addedEvent.origintype = "umundo"; - addedEvent.type = Event::EXTERNAL; + addedEvent.eventType = Event::EXTERNAL; addedEvent.name = _invokeId + ".removed"; std::map<std::string, std::string>::const_iterator propIter = desc.getProperties().begin(); |