diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-22 16:38:39 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-22 16:38:39 (GMT) |
| commit | 4206a3f8629da7005a6154912ccd690a38541930 (patch) | |
| tree | 86e54842e0e63a2bd2ab47ef28aa4870b8cf07df /src/uscxml | |
| parent | fe6c55bf935449d28a697530b3c83b461be7bb48 (diff) | |
| download | uscxml-4206a3f8629da7005a6154912ccd690a38541930.zip uscxml-4206a3f8629da7005a6154912ccd690a38541930.tar.gz uscxml-4206a3f8629da7005a6154912ccd690a38541930.tar.bz2 | |
Fixed GCC warnings
Diffstat (limited to 'src/uscxml')
| -rw-r--r-- | src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp index b52daa9..303d074 100644 --- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp +++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp @@ -79,7 +79,7 @@ static std::map<SWIDataModel*, PL_engine_t> _swiEngines; PL_blob_t SWIDataModel::blobType = { PL_BLOB_MAGIC, PL_BLOB_NOCOPY, - "blob", + (char*)"blob", releaseBlob, compareBlob, writeBlob, @@ -654,7 +654,7 @@ std::string SWIDataModel::evalAsString(const std::string& expr) { } catch(PlException plex) { // we got an exception while trying to evaluate as compound PlTerm term(expr.c_str()); - if (term.type() == PL_ATOM | term.type() == PL_CHARS | term.type() == PL_STRING) { + if (term.type() == PL_ATOM || term.type() == PL_CHARS || term.type() == PL_STRING) { return std::string(term); } else { Event e; |