Index: uspace/lib/cpp/include/impl/iterator.hpp
===================================================================
--- uspace/lib/cpp/include/impl/iterator.hpp	(revision 4f22d0c3877976ea5218a065625ad264bbfea224)
+++ uspace/lib/cpp/include/impl/iterator.hpp	(revision cf573ec729d065931eaf49c895b02dcfb01a73b1)
@@ -132,6 +132,9 @@
         {
             diff_t diff{};
-            while (first++ != last)
+            while (first != last)
+            {
                 ++diff;
+                ++first;
+            }
 
             return diff;