Skip to content

Commit f07f7ec

Browse files
committed
More cleanup
1 parent 3d00d90 commit f07f7ec

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

include/pcg/pcg_random.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,11 @@ class specific_stream {
279279
using state_type = itype;
280280
using stream_state = itype;
281281

282-
constexpr itype increment() const {
282+
[[nodiscard]] constexpr itype increment() const {
283283
return inc_;
284284
}
285285

286-
constexpr itype stream() const
286+
[[nodiscard]] constexpr itype stream() const
287287
{
288288
return inc_ >> 1;
289289
}
@@ -815,9 +815,9 @@ struct xsh_rr_mixin {
815815
constexpr bitcount_t topspare = opbits;
816816
constexpr bitcount_t bottomspare = sparebits - topspare;
817817
constexpr bitcount_t xshift = (topspare + xtypebits)/2;
818-
bitcount_t rot = opbits ? bitcount_t(internal >> (bits - opbits)) & mask
818+
const rot = opbits ? bitcount_t(internal >> (bits - opbits)) & mask
819819
: 0;
820-
bitcount_t amprot = (rot << amplifier) & mask;
820+
const bitcount_t amprot = (rot << amplifier) & mask;
821821
internal ^= internal >> xshift;
822822
xtype result = xtype(internal >> bottomspare);
823823
result = rotr(result, amprot);
@@ -1143,8 +1143,8 @@ template <typename baseclass>
11431143
struct inside_out : private baseclass {
11441144
inside_out() = delete;
11451145

1146-
typedef typename baseclass::result_type result_type;
1147-
typedef typename baseclass::state_type state_type;
1146+
using result_type = baseclass::result_type;
1147+
using state_type = baseclass::state_type;
11481148
static_assert(sizeof(result_type) == sizeof(state_type),
11491149
"Require a RNG whose output function is a permutation");
11501150

0 commit comments

Comments
 (0)