From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Tue, 12 Jul 2016 15:27:55 +0000 (+0200)
Subject: rgw: ONLY improve code formatting around RGWRESTMgr.
X-Git-Tag: v11.0.1~366^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=379f6edfa8c9803150a9190d7a63d58ddbdd3850;p=ceph.git

rgw: ONLY improve code formatting around RGWRESTMgr.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h
index 79d695d12d0..0508087fb1e 100644
--- a/src/rgw/rgw_rest.h
+++ b/src/rgw/rgw_rest.h
@@ -405,19 +405,23 @@ class RGWHandler_REST_S3;
 class RGWRESTMgr {
   bool should_log;
 protected:
-  map<string, RGWRESTMgr *> resource_mgrs;
-  multimap<size_t, string> resources_by_size;
-  RGWRESTMgr *default_mgr;
+  std::map<std::string, RGWRESTMgr*> resource_mgrs;
+  std::multimap<std::size_t, std::string> resources_by_size;
+  RGWRESTMgr* default_mgr;
 
 public:
-  RGWRESTMgr() : should_log(false), default_mgr(NULL) {}
+  RGWRESTMgr()
+    : should_log(false),
+      default_mgr(nullptr) {
+  }
   virtual ~RGWRESTMgr();
 
   void register_resource(string resource, RGWRESTMgr *mgr);
   void register_default_mgr(RGWRESTMgr *mgr);
 
-  virtual RGWRESTMgr *get_resource_mgr(struct req_state *s, const string& uri,
-				       string *out_uri);
+  virtual RGWRESTMgr* get_resource_mgr(struct req_state *s,
+                                       const std::string& uri,
+                                       std::string* out_uri);
 
   virtual RGWRESTMgr* get_resource_mgr_as_default(struct req_state* s,
                                                   const std::string& uri,
diff --git a/src/rgw/rgw_rest_swift.h b/src/rgw/rgw_rest_swift.h
index 249ddfe071f..87fb557f28c 100644
--- a/src/rgw/rgw_rest_swift.h
+++ b/src/rgw/rgw_rest_swift.h
@@ -261,7 +261,7 @@ public:
   RGWRESTMgr_SWIFT() {}
   virtual ~RGWRESTMgr_SWIFT() {}
 
-  virtual RGWHandler_REST *get_handler(struct req_state *s);
+  RGWHandler_REST *get_handler(struct req_state *s) override;
 
   RGWRESTMgr* get_resource_mgr_as_default(struct req_state* s,
                                           const std::string& uri,