Merge pull request #3356 from tautschnig/vs-shadow-11

Do not shadow raw_ptr, use_count

Author: Daniel Kroening

src/util/sharing_map.h

@@ -487,19 +487,19 @@ ::count_unmarked_nodes(bool leafs_only, std::set<void *> &marked, bool mark)
 
       for(const auto &l : ll)
       {
-        const unsigned use_count = l.data.use_count();
-        void *raw_ptr = l.data.get();
+        const unsigned leaf_use_count = l.data.use_count();
+        void *leaf_raw_ptr = l.data.get();
 
-        if(use_count >= 2)
+        if(leaf_use_count >= 2)
         {
-          if(marked.find(raw_ptr) != marked.end())
+          if(marked.find(leaf_raw_ptr) != marked.end())
           {
             continue;
           }
 
           if(mark)
           {
-            marked.insert(raw_ptr);
+            marked.insert(leaf_raw_ptr);
           }
         }