Remove the custom demangle function and use GCC's abi::__cxa_demangle instead

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

diff --git a/source/core/getopt.h b/source/core/getopt.h
index 2824a0b7c7f3b79378477853fa8874300a98eb75..3315108f05d34939d6d8d609fae973c915252296 100644 (file)
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -7,9 +7,9 @@ Distributed under the LGPL
 #ifndef MSP_CORE_GETOPT_H_
 #define MSP_CORE_GETOPT_H_
 
-#include <list>
 #include <sstream>
 #include <string>
+#include <vector>
 #include "error.h"
 
 namespace Msp {
@@ -46,7 +46,7 @@ public:
                OptBase(char s, const std::string &l, ArgType a): shrt(s), lng(l), arg_type(a), seen_count(0) { }
        };
 
-       const std::list<std::string> &get_args() const { return args; }
+       const std::vector<std::string> &get_args() const { return args; }
 
        template<typename T>
        OptBase &add_option(char s, const std::string &l, T &d, ArgType a=NO_ARG)
@@ -128,7 +128,7 @@ private:
        };
 
        std::list<OptBase *>   opts;
-       std::list<std::string> args;
+       std::vector<std::string> args;
 
        OptBase &get_option(char);
        OptBase &get_option(const std::string &);