From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 17 Nov 2015 15:31:31 +0000 (-0500)
Subject: librbd: fix missing header dependencies for parent_types.h
X-Git-Tag: v10.0.2~35^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2eb27fb9e7486cc4bd58dd71bf622906262c258;p=ceph.git

librbd: fix missing header dependencies for parent_types.h

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/parent_types.h b/src/librbd/parent_types.h
index 5c54953061ea..5e2679423b2e 100644
--- a/src/librbd/parent_types.h
+++ b/src/librbd/parent_types.h
@@ -3,16 +3,20 @@
 #ifndef CEPH_LIBRBD_PARENT_TYPES_H
 #define CEPH_LIBRBD_PARENT_TYPES_H
 
+#include "include/int_types.h"
+#include "include/types.h"
+#include <string>
+
 namespace librbd {
   /** @brief Unique identification of a parent in clone relationship.
    * Cloning an image creates a child image that keeps a reference
    * to its parent. This allows copy-on-write images. */
   struct parent_spec {
     int64_t pool_id;
-    string image_id;
+    std::string image_id;
     snapid_t snap_id;
     parent_spec() : pool_id(-1), snap_id(CEPH_NOSNAP) {}
-    parent_spec(uint64_t pool_id, string image_id, snapid_t snap_id) :
+    parent_spec(uint64_t pool_id, std::string image_id, snapid_t snap_id) :
       pool_id(pool_id), image_id(image_id), snap_id(snap_id) {}
     bool operator==(const parent_spec &other) {
       return ((this->pool_id == other.pool_id) &&