From: Adam C. Emerson Date: Fri, 29 Mar 2019 01:26:23 +0000 (-0400) Subject: common: Update options.h to work without using namespace X-Git-Tag: v15.0.0~19^2~31 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48e7188b039959dec0f6c0f8964982ca348559a7;p=ceph.git common: Update options.h to work without using namespace Signed-off-by: Adam C. Emerson --- diff --git a/src/common/options.h b/src/common/options.h index 3f1cc4c94652..ac23560d2671 100644 --- a/src/common/options.h +++ b/src/common/options.h @@ -220,7 +220,7 @@ struct Option { } } - void dump_value(const char *field_name, const value_t &v, Formatter *f) const; + void dump_value(const char *field_name, const value_t &v, ceph::Formatter *f) const; // Validate and potentially modify incoming string value int pre_validate(std::string *new_value, std::string *err) const; @@ -361,8 +361,8 @@ struct Option { return *this; } - void dump(Formatter *f) const; - void print(ostream *out) const; + void dump(ceph::Formatter *f) const; + void print(std::ostream *out) const; bool has_flag(flag_t f) const { return flags & f;