Preparations for C89 datamodel

2 files changed, 17 insertions, 6 deletions

diff --git a/src/uscxml/plugins/datamodel/c89/C89DataModel.cpp b/src/uscxml/plugins/datamodel/c89/C89DataModel.cpp
index 699d946..1180eae 100644
--- a/src/uscxml/plugins/datamodel/c89/C89DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/c89/C89DataModel.cpp
@@ -25,7 +25,6 @@
 
 #include "uscxml/messages/Event.h"
 #include "uscxml/util/DOM.h"
-#include <easylogging++.h>
 
 namespace uscxml {
 
@@ -38,7 +37,7 @@ std::shared_ptr<DataModelImpl> C89DataModel::create(DataModelCallbacks* callback
 	return dm;
 }
 
-C89DataModel::setup() {
+void C89DataModel::setup() {
 	PicocInitialise(&_pc, PICOC_STACK_SIZE);
 	PicocIncludeAllSystemHeaders(&_pc);
 
@@ -79,10 +78,14 @@ bool C89DataModel::isDeclared(const std::string& expr) {
 }
 
 
-void C89DataModel::assign(const std::string& location, const Data& data) {
+void C89DataModel::assign(const std::string& location,
+                          const Data& data,
+                          const std::map<std::string, std::string>& attr) {
 }
 
-void C89DataModel::init(const std::string& location, const Data& data) {
+void C89DataModel::init(const std::string& location,
+                        const Data& data,
+                        const std::map<std::string, std::string>& attr) {
 }
 
 bool C89DataModel::evalAsBool(const std::string& expr) {
diff --git a/src/uscxml/plugins/datamodel/c89/C89DataModel.h b/src/uscxml/plugins/datamodel/c89/C89DataModel.h
index 526d06c..880b6a4 100644
--- a/src/uscxml/plugins/datamodel/c89/C89DataModel.h
+++ b/src/uscxml/plugins/datamodel/c89/C89DataModel.h
@@ -23,7 +23,10 @@
 #include "uscxml/plugins/DataModelImpl.h"
 #include <list>
 
+#ifndef WIN32
 #define UNIX_HOST
+#endif
+
 #define PICOC_STACK_SIZE (128*1024)              /* space for the the stack */
 
 extern "C" {
@@ -80,8 +83,13 @@ public:
 
 	virtual bool isDeclared(const std::string& expr);
 
-	virtual void assign(const std::string& location, const Data& data);
-	virtual void init(const std::string& location, const Data& data);
+	virtual void assign(const std::string& location,
+	                    const Data& data,
+	                    const std::map<std::string, std::string>& attr = std::map<std::string, std::string>());
+
+	virtual void init(const std::string& location,
+	                  const Data& data,
+	                  const std::map<std::string, std::string>& attr = std::map<std::string, std::string>());
 
 	virtual std::string andExpressions(std::list<std::string>);