diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-04 18:12:42 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-04 18:12:42 (GMT) |
| commit | 0f7384f64b4cc629eff2157f08fd10d02c19511f (patch) | |
| tree | 6014e10a331ac87740b004c55e1362724d8b77d4 /src/uscxml/Interpreter.h | |
| parent | a6dce403dd86249985c224ff3408b7bbfda95754 (diff) | |
| download | uscxml-0f7384f64b4cc629eff2157f08fd10d02c19511f.zip uscxml-0f7384f64b4cc629eff2157f08fd10d02c19511f.tar.gz uscxml-0f7384f64b4cc629eff2157f08fd10d02c19511f.tar.bz2 | |
Finally got preemption working
Diffstat (limited to 'src/uscxml/Interpreter.h')
| -rw-r--r-- | src/uscxml/Interpreter.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/uscxml/Interpreter.h b/src/uscxml/Interpreter.h index 4bac414..0352f2b 100644 --- a/src/uscxml/Interpreter.h +++ b/src/uscxml/Interpreter.h @@ -228,7 +228,7 @@ public: Arabica::XPath::NodeSet<std::string> getInitialStates(Arabica::DOM::Node<std::string> state = Arabica::DOM::Node<std::string>()); static Arabica::XPath::NodeSet<std::string> getChildStates(const Arabica::DOM::Node<std::string>& state); static Arabica::DOM::Node<std::string> getParentState(const Arabica::DOM::Node<std::string>& element); - static bool hasAncestorElement(const Arabica::DOM::Node<std::string>& node, const std::string tagName); + static Arabica::DOM::Node<std::string> getAncestorElement(const Arabica::DOM::Node<std::string>& node, const std::string tagName); Arabica::XPath::NodeSet<std::string> getTargetStates(const Arabica::DOM::Node<std::string>& transition); Arabica::DOM::Node<std::string> getSourceState(const Arabica::DOM::Node<std::string>& transition); @@ -297,12 +297,10 @@ protected: static void delayedSend(void* userdata, std::string eventName); static bool nameMatch(const std::string& transitionEvent, const std::string& event); - bool isWithinSameChild(const Arabica::DOM::Node<std::string>& transition); bool hasConditionMatch(const Arabica::DOM::Node<std::string>& conditional); bool isInFinalState(const Arabica::DOM::Node<std::string>& state); bool parentIsScxmlState(Arabica::DOM::Node<std::string> state); - static boost::uuids::random_generator uuidGen; long _lastRunOnMainThread; |