diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-12 23:02:12 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-12 23:02:12 (GMT) |
commit | 57510db0f3f10f85ecea53376ccf40688e2475bd (patch) | |
tree | a5c19df017c945ab1c931c979ed2dbad1afe25e2 /src/uscxml | |
parent | d22ea4f60d6fee6a7dc564e5e83719eb2c189425 (diff) | |
download | uscxml-57510db0f3f10f85ecea53376ccf40688e2475bd.zip uscxml-57510db0f3f10f85ecea53376ccf40688e2475bd.tar.gz uscxml-57510db0f3f10f85ecea53376ccf40688e2475bd.tar.bz2 |
Fixed build issues on unices
Diffstat (limited to 'src/uscxml')
-rw-r--r-- | src/uscxml/Factory.cpp | 31 | ||||
-rw-r--r-- | src/uscxml/Message.cpp | 1 |
2 files changed, 4 insertions, 28 deletions
diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp index 5ad5e9a..667c6f0 100644 --- a/src/uscxml/Factory.cpp +++ b/src/uscxml/Factory.cpp @@ -199,10 +199,10 @@ Factory::Factory() { BasicHTTPIOProcessor* ioProcessor = new BasicHTTPIOProcessor(); registerIOProcessor(ioProcessor); } - { - MMIHTTPIOProcessor* ioProcessor = new MMIHTTPIOProcessor(); - registerIOProcessor(ioProcessor); - } + { + MMIHTTPIOProcessor* ioProcessor = new MMIHTTPIOProcessor(); + registerIOProcessor(ioProcessor); + } { SCXMLIOProcessor* ioProcessor = new SCXMLIOProcessor(); registerIOProcessor(ioProcessor); @@ -223,29 +223,6 @@ Factory::Factory() { PostponeElement* element = new PostponeElement(); registerExecutableContent(element); } - -#if 0 - { - ELEMENT_MMI_REGISTER(PrepareRequest); - ELEMENT_MMI_REGISTER(StartRequest); - ELEMENT_MMI_REGISTER(PauseRequest); - ELEMENT_MMI_REGISTER(ResumeRequest); - ELEMENT_MMI_REGISTER(CancelRequest); - ELEMENT_MMI_REGISTER(ClearContextRequest); - ELEMENT_MMI_REGISTER(StatusRequest); - ELEMENT_MMI_REGISTER(NewContextResponse); - ELEMENT_MMI_REGISTER(PrepareResponse); - ELEMENT_MMI_REGISTER(StartResponse); - ELEMENT_MMI_REGISTER(PauseResponse); - ELEMENT_MMI_REGISTER(ResumeResponse); - ELEMENT_MMI_REGISTER(CancelResponse); - ELEMENT_MMI_REGISTER(ClearContextResponse); - ELEMENT_MMI_REGISTER(StatusResponse); - ELEMENT_MMI_REGISTER(DoneNotification); - ELEMENT_MMI_REGISTER(NewContextRequest); - ELEMENT_MMI_REGISTER(ExtensionNotification); - } -#endif #endif } diff --git a/src/uscxml/Message.cpp b/src/uscxml/Message.cpp index dbcf976..2425c76 100644 --- a/src/uscxml/Message.cpp +++ b/src/uscxml/Message.cpp @@ -276,7 +276,6 @@ Data Data::fromJSON(const std::string& jsonString) { size_t currTok = 0; do { - jsmntok_t t2 = t[currTok]; switch (t[currTok].type) { case JSMN_STRING: dataStack.back()->type = Data::VERBATIM; |