Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build with clang #32

Merged
merged 4 commits into from
May 1, 2024
Merged

Fix build with clang #32

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46a695d
Forward `negout` to `Cal_BddSize()`
nhusung May 1, 2024
3f42df7
Allow copy-elision
nhusung May 1, 2024
553b275
Fix clangd error messages on includes
nhusung May 1, 2024
a517c39
Fix build with clang
nhusung May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/calObj.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
#define _CALOBJ

extern "C" {
#include <cal.h>
#include <calInt.h>
#include "cal.h"
#include "calInt.h"
}

#include <vector>
Expand Down Expand Up @@ -292,7 +292,7 @@ public:
/// negative-output pointers (complement edges).
//////////////////////////////////////////////////////////////////////////////
unsigned long Size(bool negout = true) const
{ return Cal_BddSize(this->_bddManager, this->_bdd, 0); }
{ return Cal_BddSize(this->_bddManager, this->_bdd, negout); }

//////////////////////////////////////////////////////////////////////////////
/// \copybrief Cal_BddSatisfyingFraction
Expand Down Expand Up @@ -609,7 +609,7 @@ protected:

out.push_back(Cal_BddNull(bddManager));

return std::move(out);
return out;
}

//////////////////////////////////////////////////////////////////////////////
Expand All @@ -628,7 +628,7 @@ protected:
res.push_back(BDD(bddManager, bddArray[i]));
}

return std::move(res);
return res;
}

/// \endcond
Expand Down Expand Up @@ -1201,7 +1201,7 @@ public:
std::vector<Cal_Bdd> c_arg =
BDD::C_Bdd_vector(this->_bddManager, std::move(begin), std::move(end));

const BDD res = Cal_BddMultiwayAnd(this->_bddManager, c_arg.data());
const BDD res(this->_bddManager, Cal_BddMultiwayAnd(this->_bddManager, c_arg.data()));

BDD::Free(this->_bddManager, c_arg.begin(), c_arg.end());

Expand Down Expand Up @@ -1242,7 +1242,7 @@ public:
std::vector<Cal_Bdd> c_arg =
BDD::C_Bdd_vector(this->_bddManager, std::move(begin), std::move(end));

const BDD res = Cal_BddMultiwayOr(this->_bddManager, c_arg.data());
const BDD res(this->_bddManager, Cal_BddMultiwayOr(this->_bddManager, c_arg.data()));

BDD::Free(this->_bddManager, c_arg.begin(), c_arg.end());

Expand Down Expand Up @@ -1283,7 +1283,7 @@ public:
std::vector<Cal_Bdd> c_arg =
BDD::C_Bdd_vector(this->_bddManager, std::move(begin), std::move(end));

const BDD res = Cal_BddMultiwayXor(this->_bddManager, c_arg.data());
const BDD res(this->_bddManager, Cal_BddMultiwayXor(this->_bddManager, c_arg.data()));

BDD::Free(this->_bddManager, c_arg.begin(), c_arg.end());

Expand Down
Loading