1 files changed, 5 insertions, 19 deletions
diff --git a/dwflpp.cxx b/dwflpp.cxx
index d96f3eda..36b016c7 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -98,25 +98,11 @@ dwflpp::~dwflpp()
 {
   free(cached_scopes);
 
-  for (module_cu_cache_t::iterator it = module_cu_cache.begin();
-       it != module_cu_cache.end(); ++it)
-    delete it->second;
-
-  for (mod_cu_function_cache_t::iterator it = cu_function_cache.begin();
-       it != cu_function_cache.end(); ++it)
-    delete it->second;
-
-  for (cu_inl_function_cache_t::iterator it = cu_inl_function_cache.begin();
-       it != cu_inl_function_cache.end(); ++it)
-    delete it->second;
-
-  for (mod_cu_type_cache_t::iterator it = global_alias_cache.begin();
-       it != global_alias_cache.end(); ++it)
-    delete it->second;
-
-  for (mod_cu_die_parent_cache_t::iterator it = cu_die_parent_cache.begin();
-       it != cu_die_parent_cache.end(); ++it)
-    delete it->second;
+  delete_map(module_cu_cache);
+  delete_map(cu_function_cache);
+  delete_map(cu_inl_function_cache);
+  delete_map(global_alias_cache);
+  delete_map(cu_die_parent_cache);
 
   if (dwfl)
     dwfl_end(dwfl);