diff options
Diffstat (limited to 'src/uscxml/plugins')
4 files changed, 7 insertions, 5 deletions
diff --git a/src/uscxml/plugins/Factory.cpp b/src/uscxml/plugins/Factory.cpp index 5b767b6..6ca599c 100644 --- a/src/uscxml/plugins/Factory.cpp +++ b/src/uscxml/plugins/Factory.cpp @@ -33,10 +33,11 @@ #include "uscxml/plugins/InvokerImpl.h" #include "uscxml/plugins/DataModelImpl.h" +#if 0 #include <xercesc/dom/DOM.hpp> #include <xercesc/util/PlatformUtils.hpp> #include "uscxml/util/DOM.h" - +#endif // see http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system @@ -538,13 +539,14 @@ size_t DataModelImpl::replaceExpressions(std::string& content) { Factory* Factory::getInstance() { - // this needs to be here as some plugins use xercesc +#if 0 + // this needs to be here as some plugins use xercesc, now in X::X in DOM.h try { ::xercesc_3_1::XMLPlatformUtils::Initialize(); } catch (const XERCESC_NS::XMLException& toCatch) { ERROR_PLATFORM_THROW("Cannot initialize XercesC: " + X(toCatch.getMessage()).str()); } - +#endif if (_instance == NULL) { _instance = new Factory(Factory::_defaultPluginPath); } diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp index 9eaa8c5..684604f 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp @@ -27,7 +27,6 @@ #include "uscxml/util/String.h" #include "V8DataModel.h" -//#include "V8SCXMLEvent.h" #include "uscxml/messages/Event.h" #include "uscxml/util/DOM.h" diff --git a/src/uscxml/plugins/datamodel/null/NullDataModel.cpp b/src/uscxml/plugins/datamodel/null/NullDataModel.cpp index efa77fa..cf608f5 100644 --- a/src/uscxml/plugins/datamodel/null/NullDataModel.cpp +++ b/src/uscxml/plugins/datamodel/null/NullDataModel.cpp @@ -21,7 +21,6 @@ #include "uscxml/Common.h" #include "NullDataModel.h" -#include "uscxml/util/DOM.h" #ifdef BUILD_AS_PLUGINS #include <Pluma/Connector.hpp> diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp index d3bc5bf..783727a 100644 --- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp @@ -18,6 +18,8 @@ */ #include "USCXMLInvoker.h" +#include "uscxml/util/DOM.h" + #ifdef BUILD_AS_PLUGINS #include <Pluma/Connector.hpp> |