Fix member shadowing and type conversion warnings under strict compiler checks

Author: JkarVN

CMakeLists.txt

@@ -15,6 +15,12 @@ target_include_directories(pcg-cpp INTERFACE
 
 target_compile_features(pcg-cpp INTERFACE cxx_std_11)
 
+if(MSVC)
+    target_compile_options(pcg-cpp INTERFACE /W4) # /Wall is extremely noisy on MSVC
+else()
+    target_compile_options(pcg-cpp INTERFACE -Wall -Wextra -Wpedantic)
+endif()
+
 # Options
 option(PCG_CPP_BUILD_SAMPLES "Build samples" ON)
 option(PCG_CPP_BUILD_TESTS "Build tests" ON)

include/pcg_extras.hpp

@@ -401,10 +401,10 @@ SrcIter uneven_copy_impl(
     typedef typename std::iterator_traits<SrcIter>::value_type  src_t;
     typedef typename std::iterator_traits<DestIter>::value_type dest_t;
 
-    constexpr bitcount_t SRC_SIZE  = sizeof(src_t);
-    constexpr bitcount_t DEST_SIZE = sizeof(dest_t);
-    constexpr bitcount_t DEST_BITS = DEST_SIZE * 8;
-    constexpr bitcount_t SCALE     = SRC_SIZE / DEST_SIZE;
+    constexpr size_t SRC_SIZE  = sizeof(src_t);
+    constexpr size_t DEST_SIZE = sizeof(dest_t);
+    constexpr bitcount_t DEST_BITS = bitcount_t(DEST_SIZE * 8);
+    constexpr size_t SCALE     = SRC_SIZE / DEST_SIZE;
 
     size_t count = 0;
     src_t value = 0;
@@ -437,10 +437,10 @@ SrcIter uneven_copy_impl(
 
     while (dest_first != dest_last) {
         dest_t value(0UL);
-        unsigned int shift = 0;
+        size_t shift = 0;
 
         for (size_t i = 0; i < SCALE; ++i) {
-            value |= dest_t(*src_first++) << shift;
+            value |= dest_t(*src_first++) << bitcount_t(shift);
             shift += SRC_BITS;
         }
 

include/pcg_random.hpp

@@ -676,8 +676,8 @@ itype engine<xtype,itype,output_mixin,output_previous,stream_mixin,
     itype cur_state, itype newstate, itype cur_mult, itype cur_plus, itype mask)
 {
     constexpr itype ONE  = 1u;  // itype could be weird, so use constant
-    bool is_mcg = cur_plus == itype(0);
-    itype the_bit = is_mcg ? itype(4u) : itype(1u);
+    bool is_mcg_internal = cur_plus == itype(0);
+    itype the_bit = is_mcg_internal ? itype(4u) : itype(1u);
     itype distance = 0u;
     while ((cur_state & mask) != (newstate & mask)) {
        if ((cur_state & the_bit) != (newstate & the_bit)) {
@@ -689,7 +689,7 @@ itype engine<xtype,itype,output_mixin,output_previous,stream_mixin,
        cur_plus = (cur_mult+ONE)*cur_plus;
        cur_mult *= cur_mult;
     }
-    return is_mcg ? distance >> 2 : distance;
+    return is_mcg_internal ? distance >> 2 : distance;
 }
 
 template <typename xtype, typename itype,

sample/cppref-sample.cpp

@@ -63,7 +63,7 @@ int main()
 
     std::map<int, int> hist;
     for (int n = 0; n < 10000; ++n) {
-        ++hist[std::round(normal_dist(rng))];
+        ++hist[int(std::round(normal_dist(rng)))];
     }
     std::cout << "Normal distribution around " << mean << ":\n";
     for (auto p : hist) {