diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-07 23:40:11 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-07 23:40:11 (GMT) |
| commit | 3a8a7a56ab604c3cca49792973c8b0c6d8a089b9 (patch) | |
| tree | 43c7897a69b707d3e2038ed7608ab884cd2f8877 /src/uscxml | |
| parent | 36b5c7614cc896d043ddeebae1cdb4e8e94afe18 (diff) | |
| download | uscxml-3a8a7a56ab604c3cca49792973c8b0c6d8a089b9.zip uscxml-3a8a7a56ab604c3cca49792973c8b0c6d8a089b9.tar.gz uscxml-3a8a7a56ab604c3cca49792973c8b0c6d8a089b9.tar.bz2 | |
Got rid of some warnings with gcc
Diffstat (limited to 'src/uscxml')
| -rw-r--r-- | src/uscxml/Common.h | 3 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp | 3 | ||||
| -rw-r--r-- | src/uscxml/plugins/element/file/FileElement.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/uscxml/Common.h b/src/uscxml/Common.h index 279306a..f73e8bd 100644 --- a/src/uscxml/Common.h +++ b/src/uscxml/Common.h @@ -10,6 +10,9 @@ #include <sys/socket.h> #endif +#define _USE_MATH_DEFINES +#include <cmath> + #if defined(_MSC_VER) // disable signed / unsigned comparison warnings #pragma warning (disable : 4018) diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp index aec044e..092426e 100644 --- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp +++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp @@ -106,7 +106,8 @@ boost::shared_ptr<DataModelImpl> SWIDataModel::create(InterpreterImpl* interpret int rc = PL_set_engine(engine, NULL); assert(rc == PL_ENGINE_SET); - + (void)rc; + _plModule = boost::replace_all_copy(interpreter->getSessionId(), "-", ""); boost::replace_all(_plModule, "0", "g"); boost::replace_all(_plModule, "1", "h"); diff --git a/src/uscxml/plugins/element/file/FileElement.cpp b/src/uscxml/plugins/element/file/FileElement.cpp index e551ad7..2287eed 100644 --- a/src/uscxml/plugins/element/file/FileElement.cpp +++ b/src/uscxml/plugins/element/file/FileElement.cpp @@ -67,7 +67,7 @@ void FileElement::enterElement(const Arabica::DOM::Node<std::string>& node) { std::string contentStr; char* content = NULL; - size_t contentSize; + size_t contentSize = 0; if (_operation == WRITE || _operation == APPEND) { if (!HAS_ATTR(node, "content") && !HAS_ATTR(node, "contentexpr")) { LOG(ERROR) << "File element requires content or contentexpr"; |