diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-30 20:41:50 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-30 20:41:50 (GMT) |
commit | b7a2d38bdcee3bf85a32dea7ac74b144d5ef40fa (patch) | |
tree | bade629bcca6b6a1417cb45be4349a3c27ea0feb /src/uscxml/messages/Data.h | |
parent | afbd0c4463c6f28ec1cd6ea45a68fdbcfcfeae6c (diff) | |
download | uscxml-b7a2d38bdcee3bf85a32dea7ac74b144d5ef40fa.zip uscxml-b7a2d38bdcee3bf85a32dea7ac74b144d5ef40fa.tar.gz uscxml-b7a2d38bdcee3bf85a32dea7ac74b144d5ef40fa.tar.bz2 |
See detailled log
- Forcing Data.Type for Data(String) constructor now, default used to be INTERPRETED.
- setDataModel and addIOProcessor on interpreter now
- fixed a bug with Data(bool) constructor
- various smaller fixes
Diffstat (limited to 'src/uscxml/messages/Data.h')
-rw-r--r-- | src/uscxml/messages/Data.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/uscxml/messages/Data.h b/src/uscxml/messages/Data.h index 584bf09..0d27548 100644 --- a/src/uscxml/messages/Data.h +++ b/src/uscxml/messages/Data.h @@ -44,7 +44,7 @@ public: Data() : type(INTERPRETED) {} // TODO: default INTERPRETED is unfortunate - Data(const std::string& atom, Type type = INTERPRETED) : atom(atom), type(type) {} + Data(const std::string& atom, Type type) : atom(atom), type(type) {} Data(const char* data, size_t size, const std::string& mimeType, bool adopt = false); // convenience constructors @@ -57,9 +57,9 @@ public: Data(double atom) : atom(toStr(atom)), type(INTERPRETED) {} Data(bool atom) : type(INTERPRETED) { if (atom) { - atom = "true"; + this->atom = "true"; } else { - atom = "false"; + this->atom = "false"; } } @@ -67,7 +67,7 @@ public: #if 0 // constructor for arbitrary types, skip if type is subclass though (C++11) - // we will have to drop this constructor as it interferes with operator Data() and entails C++11 + // we will have to drop this constructor as it interferes with operator Data() and requires C++11 template <typename T> Data(T value, typename std::enable_if<! std::is_base_of<Data, T>::value>::type* = nullptr) : atom(toStr(value)), type(INTERPRETED) {} |