diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-08 00:24:59 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-08 00:24:59 (GMT) |
| commit | 8daf2ea0a7192e556cc059c2220469ea22155380 (patch) | |
| tree | 20494f647dad5dbea56f9c0a5b7241d1e9e3c7f7 /src | |
| parent | 3a8a7a56ab604c3cca49792973c8b0c6d8a089b9 (diff) | |
| download | uscxml-8daf2ea0a7192e556cc059c2220469ea22155380.zip uscxml-8daf2ea0a7192e556cc059c2220469ea22155380.tar.gz uscxml-8daf2ea0a7192e556cc059c2220469ea22155380.tar.bz2 | |
More fixes for MSVC
Diffstat (limited to 'src')
| -rw-r--r-- | src/uscxml/Common.h | 2 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/uscxml/Common.h b/src/uscxml/Common.h index f73e8bd..09785be 100644 --- a/src/uscxml/Common.h +++ b/src/uscxml/Common.h @@ -5,7 +5,9 @@ #include <winsock2.h> // see http://stackoverflow.com/questions/1372480/c-redefinition-header-files #define _WINSOCKAPI_ // stops windows.h including winsock.h +#define WIN32_LEAN_AND_MEAN #include <windows.h> +#undef WIN32_LEAN_AND_MEAN #else #include <sys/socket.h> #endif diff --git a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp index ee74a5f..c155644 100644 --- a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp +++ b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp @@ -211,7 +211,7 @@ Data XPathDataModel::getStringAsData(const std::string& content) { switch (result.type()) { case ANY: break; - case BOOL: + case Arabica::XPath::BOOL: ss << result.asBool(); break; case NUMBER: @@ -225,7 +225,6 @@ Data XPathDataModel::getStringAsData(const std::string& content) { for (int i = 0; i < ns.size(); i++) { ss << ns[i]; } - ss << result; break; } |