1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-09 13:56:00 +00:00

Change static const to static constexpr wherever possible

Since we require C++11, most of these consts can be constexpr.

Two `static const ld` remain non-compile-time-evaluable because
they depend on the runtime `log` function. One `static const cld`
remains non-compile-time because `std::complex<T>` doesn't become
constexpr until C++14.
This commit is contained in:
Arthur O'Dwyer
2023-08-23 09:44:37 -08:00
parent b70b339f52
commit 62629f3e70
48 changed files with 453 additions and 458 deletions

View File

@@ -12,11 +12,11 @@ namespace kohonen {
typedef vector<double> kohvec;
static const flagtype KS_ROGUEVIZ = 1;
static const flagtype KS_NEURONS = 2;
static const flagtype KS_DISPERSION = 4;
static const flagtype KS_SAMPLES = 8;
static const flagtype KS_NEURONS_INI = 16;
static constexpr flagtype KS_ROGUEVIZ = 1;
static constexpr flagtype KS_NEURONS = 2;
static constexpr flagtype KS_DISPERSION = 4;
static constexpr flagtype KS_SAMPLES = 8;
static constexpr flagtype KS_NEURONS_INI = 16;
extern flagtype state;
@@ -139,7 +139,7 @@ struct manidata {
vector<pair<int, int> > edges;
};
static const int MCOUNT = 12;
static constexpr int MCOUNT = 12;
extern vector<string> catnames;
@@ -149,7 +149,7 @@ ld evaluate_measure(manidata& emb, manidata& orig, vector<int>& mapp, vector<pai
}
static const string som_test_dir = "results/";
static constexpr string som_test_dir = "results/";
}