From: xie xingguo Date: Tue, 27 Jun 2017 12:38:37 +0000 (+0800) Subject: crush: use auto for type safety X-Git-Tag: v12.1.1~42^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e6ec9d129b39e2ab08d1860d97cbbe386ce9734;p=ceph.git crush: use auto for type safety class-id, by definition, is of type int32_t, not int. Signed-off-by: xie xingguo --- diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h index 5e3a8ea6da6f..e4aae0c87050 100644 --- a/src/crush/CrushWrapper.h +++ b/src/crush/CrushWrapper.h @@ -442,24 +442,24 @@ public: return class_rname.count(name); } const char *get_class_name(int i) const { - std::map::const_iterator p = class_name.find(i); + auto p = class_name.find(i); if (p != class_name.end()) return p->second.c_str(); return 0; } int get_class_id(const string& name) const { - std::map::const_iterator p = class_rname.find(name); + auto p = class_rname.find(name); if (p != class_rname.end()) return p->second; else return -EINVAL; } int remove_class_name(const string& name) { - std::map::const_iterator p = class_rname.find(name); + auto p = class_rname.find(name); if (p == class_rname.end()) return -ENOENT; int class_id = p->second; - std::map::const_iterator q = class_name.find(class_id); + auto q = class_name.find(class_id); if (q == class_name.end()) return -ENOENT; class_rname.erase(name);