summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/base')
-rw-r--r--src/base/hashmap.hh10
-rw-r--r--src/base/stl_helpers.hh3
2 files changed, 7 insertions, 6 deletions
diff --git a/src/base/hashmap.hh b/src/base/hashmap.hh
index e8f525e4d..eac1c6dc7 100644
--- a/src/base/hashmap.hh
+++ b/src/base/hashmap.hh
@@ -33,8 +33,10 @@
#if defined(__GNUC__) && __GNUC__ >= 3
#include <ext/hash_map>
+#include <ext/hash_set>
#else
#include <hash_map>
+#include <hash_set>
#endif
#include <string>
@@ -49,7 +51,9 @@
namespace m5 {
using ::__hash_namespace::hash_multimap;
+ using ::__hash_namespace::hash_multiset;
using ::__hash_namespace::hash_map;
+ using ::__hash_namespace::hash_set;
using ::__hash_namespace::hash;
}
@@ -88,10 +92,6 @@ namespace __hash_namespace {
return (__stl_hash_string(r.first.c_str())) ^ r.second;
}
};
-
-
-
-}
-
+/* namespace __hash_namespace */ }
#endif // __HASHMAP_HH__
diff --git a/src/base/stl_helpers.hh b/src/base/stl_helpers.hh
index 740bd1b48..9add7b8b6 100644
--- a/src/base/stl_helpers.hh
+++ b/src/base/stl_helpers.hh
@@ -60,12 +60,13 @@ class ContainerPrint
void
operator()(const T &elem)
{
- out << elem;
// First one doesn't get a space before it. The rest do.
if (first)
first = false;
else
out << " ";
+
+ out << elem;
}
};