diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

C++ incompatibilities.

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-03-14 23:03:22 +00:00
parent e843d8f536
commit 6d2e2597b1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CLPBN/horus/HorusCli.cpp
View File

@ -131,7 +131,7 @@ readQueryAndEvidence (
} }
Horus::VarId vid = Horus::Util::stringToUnsigned (arg); Horus::VarId vid = Horus::Util::stringToUnsigned (arg);
Horus::VarNode* queryVar = fg.getVarNode (vid); Horus::VarNode* queryVar = fg.getVarNode (vid);
if (queryVar == false) { if (queryVar == nullptr) {
std::cerr << "Error: unknow variable with id " ; std::cerr << "Error: unknow variable with id " ;
std::cerr << "`" << vid << "'." << std::endl; std::cerr << "`" << vid << "'." << std::endl;
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
@ -153,7 +153,7 @@ readQueryAndEvidence (
} }
Horus::VarId vid = Horus::Util::stringToUnsigned (leftArg); Horus::VarId vid = Horus::Util::stringToUnsigned (leftArg);
Horus::VarNode* observedVar = fg.getVarNode (vid); Horus::VarNode* observedVar = fg.getVarNode (vid);
if (observedVar == false) { if (observedVar == nullptr) {
std::cerr << "Error: unknow variable with id " ; std::cerr << "Error: unknow variable with id " ;
std::cerr << "`" << vid << "'." << std::endl; std::cerr << "`" << vid << "'." << std::endl;
exit (EXIT_FAILURE); exit (EXIT_FAILURE);

2
packages/swi-minisat2/C/SolverTypes.h
View File

@ -119,7 +119,7 @@ public:
// -- use this function instead: // -- use this function instead:
template<class V> template<class V>
friend Clause* Clause_new(const V& ps, bool learnt = false); friend Clause* Clause_new(const V& ps, bool learnt);
int size () const { return size_etc >> 3; } int size () const { return size_etc >> 3; }
void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); } void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); }