summaryrefslogtreecommitdiffstats
path: root/fusetrace
diff options
context:
space:
mode:
authorNoah Watkins <noahwatkins@gmail.com>2013-10-29 15:46:24 +0100
committerNoah Watkins <noahwatkins@gmail.com>2014-01-18 23:03:20 +0100
commit4c4e1d0d470beba7690d1c0e39bfd1146a25f465 (patch)
treec94ea90d5100ebf816b42f6d9a1651789127fc05 /fusetrace
parentlibc++: create portable smart ptr / hash_map/set (diff)
downloadceph-4c4e1d0d470beba7690d1c0e39bfd1146a25f465.tar.xz
ceph-4c4e1d0d470beba7690d1c0e39bfd1146a25f465.zip
libc++: use ceph:: namespaced data types
Switches the implemetnation of smart pointers and unordered map/set to use the ceph:: versions. Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Diffstat (limited to 'fusetrace')
-rw-r--r--fusetrace/fusetrace_ll.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/fusetrace/fusetrace_ll.cc b/fusetrace/fusetrace_ll.cc
index 7f2b8438f1f..a60a14ca6c1 100644
--- a/fusetrace/fusetrace_ll.cc
+++ b/fusetrace/fusetrace_ll.cc
@@ -33,18 +33,18 @@
#include <time.h>
-#include <ext/hash_map>
-using namespace __gnu_cxx;
+#include "include/unordered_map.h"
+#include "include/hash_namespace.h"
#ifndef __LP64__
-namespace __gnu_cxx {
+CEPH_HASH_NAMESPACE_START
template<> struct hash<uint64_t> {
size_t operator()(uint64_t __x) const {
static hash<uint32_t> H;
return H((__x >> 32) ^ (__x & 0xffffffff));
}
};
-}
+CEPH_HASH_NAMESPACE_END
#endif
@@ -89,7 +89,7 @@ struct Inode {
};
Inode *root = 0;
-hash_map<ino_t, Inode*> inode_map;
+ceph::unordered_map<ino_t, Inode*> inode_map;
bool make_inode_path(string &buf, Inode *in)
{