diff --git a/exe/ralsh.cc b/exe/ralsh.cc index 9b679de..490a564 100644 --- a/exe/ralsh.cc +++ b/exe/ralsh.cc @@ -9,6 +9,8 @@ #include #include +#include + #include #include @@ -17,6 +19,7 @@ // cause problems before including the headers, then re-enable the warnings. #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wattributes" +#pragma GCC diagnostic ignored "-Wsuggest-override" #include #pragma GCC diagnostic pop @@ -81,7 +84,7 @@ R"txt(Exit status: static void print_attr_explanation(const std::string& name, const lib::attr::spec& attr, - uint maxlen) { + uint16_t maxlen) { cout << " " << color::green << left << setw(maxlen) << name << color::reset << " : " << attr.desc() << endl; @@ -102,7 +105,7 @@ static void print_explanation(lib::type& type) { return; } - uint maxlen = 0; + uint16_t maxlen = 0; for (auto a = spec->attr_begin(); a != spec->attr_end(); ++a) { if (a->first.length() > maxlen) maxlen = a->first.length(); } diff --git a/lib/inc/libral/emitter/puppet_emitter.hpp b/lib/inc/libral/emitter/puppet_emitter.hpp index e63fa3a..50dee05 100644 --- a/lib/inc/libral/emitter/puppet_emitter.hpp +++ b/lib/inc/libral/emitter/puppet_emitter.hpp @@ -2,6 +2,8 @@ #include +#include + namespace libral { class puppet_emitter : public emitter { public: @@ -21,6 +23,6 @@ namespace libral { void print_resource(const type &type, const resource &resource); void print_resource_attr(const std::string& name, const value& v, - uint maxlen); + uint16_t maxlen); }; } diff --git a/lib/src/emitter/puppet_emitter.cc b/lib/src/emitter/puppet_emitter.cc index f304495..81395b4 100644 --- a/lib/src/emitter/puppet_emitter.cc +++ b/lib/src/emitter/puppet_emitter.cc @@ -79,7 +79,7 @@ namespace libral { void puppet_emitter::print_resource(const type &type, const resource &res) { std::cout << color::blue << type.qname() << color::reset << " { '" << color::blue << res.name() << color::reset << "':" << std::endl; - uint maxlen = 0; + uint16_t maxlen = 0; for (const auto& a : res.attrs()) { if (a.first.length() > maxlen) maxlen = a.first.length(); } @@ -97,7 +97,7 @@ namespace libral { void puppet_emitter::print_resource_attr(const std::string& name, const value& v, - uint maxlen) { + uint16_t maxlen) { std::cout << " " << color::green << std::left << std::setw(maxlen) << name << color::reset << " => " << v << "," << std::endl;