Replace earlier options sharing the same short or long name

[libs/core.git] / source / core / getopt.h

diff --git a/source/core/getopt.h b/source/core/getopt.h
index ea1f7d36a33fcea90ba552e58cb8b7546e462f34..a3b7ae405ec567c4d9b0fb6a8966d89bed4fb689 100644 (file)
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -123,17 +123,19 @@ public:
 
        template<typename T>
        OptBase &add_option(char s, const std::string &l, T &d, ArgType a = NO_ARG)
-       { opts.push_back(new Option<T>(s, l, d, a)); return *opts.back(); }
+       { return add_option(new Option<T>(s, l, d, a)); }
        
        template<typename T>
        OptBase &add_option(char s, const std::string &l, std::list<T> &d, ArgType a = REQUIRED_ARG)
-       { opts.push_back(new ListOption<std::list<T> >(s, l, d, a)); return *opts.back(); }
+       { return add_option(new ListOption<std::list<T> >(s, l, d, a)); }
        
        template<typename T>
        OptBase &add_option(const std::string &l, T &d, ArgType a)
        { return add_option(0, l, d, a); }
 
 private:
+       OptBase &add_option(OptBase *);
+
        OptBase &get_option(char);
        OptBase &get_option(const std::string &);