riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use static constexpr instead of static const where possible. 

In particular inside class declarations, a static const
assignment is technically not a definition, while constexpr is.

Signed-off-by: Henner Zeller <h.zeller@acm.org>
This commit is contained in:
Henner Zeller 2020-04-14 14:19:38 -07:00
parent 6c16fd760b
commit 5c6e681673
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/sha1/sha1.h
View File

@ -35,9 +35,9 @@ public:
static std::string from_file(const std::string &filename); static std::string from_file(const std::string &filename);
private: private:
static const unsigned int DIGEST_INTS = 5; /* number of 32bit integers per SHA1 digest */ static constexpr unsigned int DIGEST_INTS = 5; /* number of 32bit integers per SHA1 digest */
static const unsigned int BLOCK_INTS = 16; /* number of 32bit integers per SHA1 block */ static constexpr unsigned int BLOCK_INTS = 16; /* number of 32bit integers per SHA1 block */
static const unsigned int BLOCK_BYTES = BLOCK_INTS * 4; static constexpr unsigned int BLOCK_BYTES = BLOCK_INTS * 4;
uint32_t digest[DIGEST_INTS]; uint32_t digest[DIGEST_INTS];
std::string buffer; std::string buffer;

3
libs/subcircuit/subcircuit.cc
View File

@ -316,7 +316,7 @@ class SubCircuit::SolverWorker
// helper functions for handling permutations // helper functions for handling permutations
static const int maxPermutationsLimit = 1000000; static constexpr int maxPermutationsLimit = 1000000;
static int numberOfPermutations(const std::vector<std::string> &list) static int numberOfPermutations(const std::vector<std::string> &list)
{ {
@ -1689,4 +1689,3 @@ void SubCircuit::Solver::clearConfig()
{ {
worker->clearConfig(); worker->clearConfig();
} }