diff options
author | 2015-04-12 08:05:15 +0200 | |
---|---|---|
committer | 2015-04-12 08:05:43 +0200 | |
commit | 7faba31b1b8dcd6caa5f1b651d2693106de08d35 (patch) | |
tree | c528d5479eee247ee5305df53a298a09b594fccc /src/lib/util/options.h | |
parent | 15a464dac99052edc0645374a77ecef8d1a65b0d (diff) |
There is no implicit conversion to char* in std::string (nw)
Diffstat (limited to 'src/lib/util/options.h')
-rw-r--r-- | src/lib/util/options.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/util/options.h b/src/lib/util/options.h index 941d3c7df70..1b9528ff433 100644 --- a/src/lib/util/options.h +++ b/src/lib/util/options.h @@ -77,10 +77,10 @@ public: entry *next() const { return m_next; } const char *name(int index = 0) const { return (index < ARRAY_LENGTH(m_name) && m_name[index]) ? m_name[index].c_str() : NULL; } const char *description() const { return m_description; } - const char *value() const { return m_data; } - const char *default_value() const { return m_defdata; } - const char *minimum() const { return m_minimum; } - const char *maximum() const { return m_maximum; } + const char *value() const { return m_data.c_str(); } + const char *default_value() const { return m_defdata.c_str(); } + const char *minimum() const { return m_minimum.c_str(); } + const char *maximum() const { return m_maximum.c_str(); } UINT32 seqid() const { return m_seqid; } int type() const { return (m_flags & OPTION_TYPE_MASK); } UINT32 flags() const { return m_flags; } @@ -127,7 +127,7 @@ public: // getters entry *first() const { return m_entrylist.first(); } - const char *command() const { return m_command; } + const char *command() const { return m_command.c_str(); } // configuration void add_entry(const char *name, const char *description, UINT32 flags = 0, const char *defvalue = NULL, bool override_existing = false); |