From 7b1bcae879305da138bb3e08d04735b54266c537 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Fri, 9 Sep 2016 13:09:46 +0100 Subject: regtools: rename error_t to err_t to avoid name clash Change-Id: Ib8d34e4f58f3225b1dafc533ce7e1b7867ad053b --- utils/regtools/include/soc_desc.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'utils/regtools/include') diff --git a/utils/regtools/include/soc_desc.hpp b/utils/regtools/include/soc_desc.hpp index b8d16b4..3d8481f 100644 --- a/utils/regtools/include/soc_desc.hpp +++ b/utils/regtools/include/soc_desc.hpp @@ -43,7 +43,7 @@ typedef int soc_id_t; const soc_id_t DEFAULT_ID = 0xcafebabe; /** Error class */ -class error_t +class err_t { public: enum level_t @@ -52,7 +52,7 @@ public: WARNING, FATAL }; - error_t(level_t lvl, const std::string& loc, const std::string& msg) + err_t(level_t lvl, const std::string& loc, const std::string& msg) :m_level(lvl), m_loc(loc), m_msg(msg) {} level_t level() const { return m_level; } std::string location() const { return m_loc; } @@ -66,11 +66,11 @@ protected: class error_context_t { public: - void add(const error_t& err) { m_list.push_back(err); } + void add(const err_t& err) { m_list.push_back(err); } size_t count() const { return m_list.size(); } - error_t get(size_t i) const { return m_list[i]; } + err_t get(size_t i) const { return m_list[i]; } protected: - std::vector< error_t > m_list; + std::vector< err_t > m_list; }; /** -- cgit v1.1