]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librgw: add missing include deps (rgw_file.h)
authorMatt Benjamin <mbenjamin@redhat.com>
Thu, 10 Dec 2015 16:24:24 +0000 (11:24 -0500)
committerMatt Benjamin <mbenjamin@redhat.com>
Fri, 12 Feb 2016 17:06:28 +0000 (12:06 -0500)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/rgw/rgw_file.h

index b2f04da83e91a3b4c0ea5d09e0eb610443837f38..b04482d8f75f2167303aeb274ff003ea18e41f2c 100644 (file)
@@ -8,6 +8,7 @@
 
 /* internal header */
 #include <string.h>
+#include <sys/stat.h>
 
 #include <atomic>
 #include <mutex>
@@ -18,6 +19,9 @@
 #include "xxhash.h"
 #include "include/buffer.h"
 #include "common/cohort_lru.h"
+#include "rgw_common.h"
+#include "rgw_user.h"
+#include "rgw_lib.h"
 
 /* XXX
  * ASSERT_H somehow not defined after all the above (which bring
@@ -152,7 +156,7 @@ namespace rgw {
     uint32_t flags;
 
   public:
-    const static string root_name;
+    const static std::string root_name;
 
     static constexpr uint16_t MAX_DEPTH = 256;
 
@@ -318,6 +322,7 @@ namespace rgw {
     }
 
     void add_marker(uint64_t off, const std::string& marker) {
+      using std::get;
       directory* d = get<directory>(&variant_type);
       if (d) {
        d->marker_cache.insert(
@@ -326,6 +331,7 @@ namespace rgw {
     }
 
     std::string find_marker(uint64_t off) { // XXX copy
+      using std::get;
       directory* d = get<directory>(&variant_type);
       if (d) {
        const auto& iter = d->marker_cache.find(off);