]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
dupstore: s/sobject_t/hobject_t
authorSamuel Just <samuel.just@dreamhost.com>
Fri, 8 Jul 2011 18:35:23 +0000 (11:35 -0700)
committerSamuel Just <samuel.just@dreamhost.com>
Tue, 30 Aug 2011 00:43:05 +0000 (17:43 -0700)
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
src/dupstore.cc

index 865e9439dcb99c5a00d41b7d48dc0a1a3af64884..dbbd55107da3f35fbd108868e6102f5d270298e7 100644 (file)
@@ -27,7 +27,7 @@ int dupstore(ObjectStore* src, ObjectStore* dst)
   if (dst->mount() < 0) return 1;
 
   // objects
-  hash_map<sobject_t, coll_t> did_object;
+  hash_map<hobject_t, coll_t> did_object;
 
   // collections
   vector<coll_t> collections;
@@ -48,11 +48,11 @@ int dupstore(ObjectStore* src, ObjectStore* dst)
       dst->apply_transaction(t);
     }
 
-    vector<sobject_t> o;
+    vector<hobject_t> o;
     src->collection_list(*p, o);
     int numo = o.size();
     int j = 1;
-    for (vector<sobject_t>::iterator q = o.begin(); q != o.end(); q++) {
+    for (vector<hobject_t>::iterator q = o.begin(); q != o.end(); q++) {
       ObjectStore::Transaction t;
       if (did_object.count(*q))
        t.collection_add(*p, did_object[*q], *q);