]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os: move Transaction ctors closer to member variables
authorCasey Bodley <cbodley@redhat.com>
Thu, 21 Jan 2016 14:42:06 +0000 (09:42 -0500)
committerCasey Bodley <cbodley@redhat.com>
Fri, 22 Jan 2016 16:02:34 +0000 (11:02 -0500)
this makes it easier to update constructors when adding/removing fields

Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/os/ObjectStore.h

index ba9dd76e97ae7b38c299cb3913e0a6496ce79dde..127d8c0c7eed87f389dfca40c483a258c7cdf6f7 100644 (file)
@@ -463,6 +463,28 @@ public:
     list<Context *> on_applied_sync;
 
   public:
+    Transaction() :
+      osr(NULL),
+      use_tbl(false),
+      coll_id(0),
+      object_id(0) { }
+
+    Transaction(bufferlist::iterator &dp) :
+      osr(NULL),
+      use_tbl(false),
+      coll_id(0),
+      object_id(0) {
+      decode(dp);
+    }
+
+    Transaction(bufferlist &nbl) :
+      osr(NULL),
+      use_tbl(false),
+      coll_id(0),
+      object_id(0) {
+      bufferlist::iterator dp = nbl.begin();
+      decode(dp);
+    }
 
     /* Operations on callback contexts */
     void register_on_applied(Context *c) {
@@ -1588,30 +1610,6 @@ public:
       data.ops++;
     }
 
-    // etc.
-    Transaction() :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) { }
-
-    Transaction(bufferlist::iterator &dp) :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) {
-      decode(dp);
-    }
-
-    Transaction(bufferlist &nbl) :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) {
-      bufferlist::iterator dp = nbl.begin();
-      decode(dp);
-    }
-
     void encode(bufferlist& bl) const {
       if (use_tbl) {
         uint64_t ops = data.ops;