diff options
author | 2016-10-22 13:13:17 +0200 | |
---|---|---|
committer | 2016-10-22 13:13:17 +0200 | |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/lib/util/options.cpp | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (diff) |
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8
also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/lib/util/options.cpp')
-rw-r--r-- | src/lib/util/options.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp index f799ad06c97..7e40ab736de 100644 --- a/src/lib/util/options.cpp +++ b/src/lib/util/options.cpp @@ -53,7 +53,7 @@ const char *const core_options::s_option_unadorned[MAX_UNADORNED_OPTIONS] = // entry - constructor //------------------------------------------------- -core_options::entry::entry(const char *name, const char *description, UINT32 flags, const char *defvalue) +core_options::entry::entry(const char *name, const char *description, uint32_t flags, const char *defvalue) : m_next(nullptr), m_flags(flags), m_seqid(0), @@ -139,7 +139,7 @@ void core_options::entry::set_description(const char *description) } -void core_options::entry::set_flag(UINT32 mask, UINT32 flag) +void core_options::entry::set_flag(uint32_t mask, uint32_t flag) { m_flags = ( m_flags & mask ) | flag; } @@ -254,7 +254,7 @@ bool core_options::operator!=(const core_options &rhs) // options set //------------------------------------------------- -void core_options::add_entry(const char *name, const char *description, UINT32 flags, const char *defvalue, bool override_existing) +void core_options::add_entry(const char *name, const char *description, uint32_t flags, const char *defvalue, bool override_existing) { // allocate a new entry auto newentry = global_alloc(entry(name, description, flags, defvalue)); @@ -410,7 +410,7 @@ bool core_options::parse_ini_file(util::core_file &inifile, int priority, int ig // find the extent of the name char *optionname; for (optionname = buffer; *optionname != 0; optionname++) - if (!isspace((UINT8)*optionname)) + if (!isspace((uint8_t)*optionname)) break; // skip comments @@ -420,7 +420,7 @@ bool core_options::parse_ini_file(util::core_file &inifile, int priority, int ig // scan forward to find the first space char *temp; for (temp = optionname; *temp != 0; temp++) - if (isspace((UINT8)*temp)) + if (isspace((uint8_t)*temp)) break; // if we hit the end early, print a warning and continue @@ -601,7 +601,7 @@ int core_options::priority(const char *name) const // seqid - return the seqid for a given option //------------------------------------------------- -UINT32 core_options::seqid(const char *name) const +uint32_t core_options::seqid(const char *name) const { auto curentry = m_entrymap.find(name); return (curentry != m_entrymap.end()) ? curentry->second->seqid() : 0; @@ -655,7 +655,7 @@ bool core_options::set_value(const char *name, float value, int priority, std::s } -void core_options::set_flag(const char *name, UINT32 mask, UINT32 flag) +void core_options::set_flag(const char *name, uint32_t mask, uint32_t flag) { // find the entry first auto curentry = m_entrymap.find(name); |