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 | |
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')
-rw-r--r-- | src/bindings/swig/php/uscxmlNativePHP.php | 55 | ||||
-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 |
4 files changed, 59 insertions, 4 deletions
diff --git a/src/bindings/swig/php/uscxmlNativePHP.php b/src/bindings/swig/php/uscxmlNativePHP.php index dccfbaf..4a9c37b 100644 --- a/src/bindings/swig/php/uscxmlNativePHP.php +++ b/src/bindings/swig/php/uscxmlNativePHP.php @@ -702,6 +702,57 @@ class SendRequest extends Event { } } +class InterpreterOptions { + public $_cPtr=null; + protected $_pData=array(); + + function __set($var,$value) { + $func = 'InterpreterOptions_'.$var.'_set'; + if (function_exists($func)) return call_user_func($func,$this->_cPtr,$value); + if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value); + $this->_pData[$var] = $value; + } + + function __isset($var) { + if (function_exists('InterpreterOptions_'.$var.'_set')) return true; + if ($var === 'thisown') return true; + return array_key_exists($var, $this->_pData); + } + + function __get($var) { + if ($var === 'additionalParameters') return new StringMap(InterpreterOptions_additionalParameters_get($this->_cPtr)); + $func = 'InterpreterOptions_'.$var.'_get'; + if (function_exists($func)) return call_user_func($func,$this->_cPtr); + if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr); + return $this->_pData[$var]; + } + function __construct($h) { + $this->_cPtr=$h; + } + + function isValid() { + return InterpreterOptions_isValid($this->_cPtr); + } + + static function printUsageAndExit($progName) { + InterpreterOptions_printUsageAndExit($progName); + } + + static function fromCmdLine($argc,$argv) { + $r=InterpreterOptions_fromCmdLine($argc,$argv); + if (is_resource($r)) { + $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3)); + if (class_exists($c)) return new $c($r); + return new InterpreterOptions($r); + } + return $r; + } + + function getCapabilities() { + return InterpreterOptions_getCapabilities($this->_cPtr); + } +} + class Interpreter { public $_cPtr=null; protected $_pData=array(); @@ -826,8 +877,8 @@ class Interpreter { return $r; } - function setCmdLineOptions($argc,$argv) { - Interpreter_setCmdLineOptions($this->_cPtr,$argc,$argv); + function setCmdLineOptions($params) { + Interpreter_setCmdLineOptions($this->_cPtr,$params); } function getCmdLineOptions() { 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"; |