Fix #80 - shuffle with containers that have 32bit index

martinus · Dec 5, 2022 · a7030c6 · a7030c6
1 parent a1fcc09
commit a7030c6
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
@@ -33,7 +33,7 @@
             <img src="_static/nanobench-logo.svg" class="logo" alt="Logo"/>
           </a>
               <div class="version">
-                v4.3.8
+                v4.3.9
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/docs/comparison.html b/docs/comparison.html
@@ -34,7 +34,7 @@
             <img src="_static/nanobench-logo.svg" class="logo" alt="Logo"/>
           </a>
               <div class="version">
-                v4.3.8
+                v4.3.9
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/docs/genindex.html b/docs/genindex.html
@@ -31,7 +31,7 @@
             <img src="_static/nanobench-logo.svg" class="logo" alt="Logo"/>
           </a>
               <div class="version">
-                v4.3.8
+                v4.3.9
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/docs/index.html b/docs/index.html
@@ -33,7 +33,7 @@
             <img src="_static/nanobench-logo.svg" class="logo" alt="Logo"/>
           </a>
               <div class="version">
-                v4.3.8
+                v4.3.9
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/docs/license.html b/docs/license.html
@@ -34,7 +34,7 @@
             <img src="_static/nanobench-logo.svg" class="logo" alt="Logo"/>
           </a>
               <div class="version">
-                v4.3.8
+                v4.3.9
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/docs/reference.html b/docs/reference.html
@@ -35,7 +35,7 @@
             <img src="_static/nanobench-logo.svg" class="logo" alt="Logo"/>
           </a>
               <div class="version">
-                v4.3.8
+                v4.3.9
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/docs/search.html b/docs/search.html
@@ -34,7 +34,7 @@
             <img src="_static/nanobench-logo.svg" class="logo" alt="Logo"/>
           </a>
               <div class="version">
-                v4.3.8
+                v4.3.9
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="#" method="get">

diff --git a/docs/tutorial.html b/docs/tutorial.html
@@ -35,7 +35,7 @@
             <img src="_static/nanobench-logo.svg" class="logo" alt="Logo"/>
           </a>
               <div class="version">
-                v4.3.8
+                v4.3.9
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/docs/conf.py b/src/docs/conf.py
@@ -22,7 +22,7 @@
 project = 'nanobench'
 copyright = '2019-2022 Martin Leitner-Ankerl <[email protected]>'
 author = 'Martin Leitner-Ankerl'
-version = 'v4.3.8'
+version = 'v4.3.9'
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/src/include/nanobench.h b/src/include/nanobench.h
@@ -33,7 +33,7 @@
 // see https://semver.org/
 #define ANKERL_NANOBENCH_VERSION_MAJOR 4 // incompatible API changes
 #define ANKERL_NANOBENCH_VERSION_MINOR 3 // backwards-compatible changes
-#define ANKERL_NANOBENCH_VERSION_PATCH 8 // backwards-compatible bug fixes
+#define ANKERL_NANOBENCH_VERSION_PATCH 9 // backwards-compatible bug fixes
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // public facing api - as minimal as possible
@@ -1182,10 +1182,11 @@ void Rng::shuffle(Container& container) noexcept {
     while (i > 1U) {
         using std::swap;
         auto n = operator()();
-        auto b1 = static_cast<size_t>((static_cast<uint32_t>(n) * static_cast<uint64_t>(i)) >> 32U);
+        // using decltype(i) instead of size_t to be compatible to containers with 32bit index (see #80)
+        auto b1 = static_cast<decltype(i)>((static_cast<uint32_t>(n) * static_cast<uint64_t>(i)) >> 32U);
         swap(container[--i], container[b1]);
 
-        auto b2 = static_cast<size_t>(((n >> 32U) * static_cast<uint64_t>(i)) >> 32U);
+        auto b2 = static_cast<decltype(i)>(((n >> 32U) * static_cast<uint64_t>(i)) >> 32U);
         swap(container[--i], container[b2]);
     }
 }