From 4206a3f8629da7005a6154912ccd690a38541930 Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Wed, 22 Jan 2014 17:38:39 +0100 Subject: Fixed GCC warnings --- src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp | 4 ++-- 1 file 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 _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; -- cgit v0.12