Use C++11 features with containers

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

diff --git a/source/core/getopt.h b/source/core/getopt.h
index 64a946c80f1b4bd9ee35509c8f297fde0bdf6671..27ce4cf2fdb05824b3834eb0d972a7192ec3a1fd 100644 (file)
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 #include <msp/strings/lexicalcast.h>
-#include "attributes.h"
 #include "noncopyable.h"
 
 namespace Msp {
@@ -204,22 +203,15 @@ private:
                { data.push_back(lexical_cast<typename T::value_type>(a)); }
        };
 
-       typedef std::list<OptionImpl *> OptionList;
-       typedef std::list<ArgumentImpl *> ArgumentList;
-
        bool help;
-       OptionList opts;
-       ArgumentList args;
+       std::list<OptionImpl *> opts;
+       std::list<ArgumentImpl *> args;
        std::vector<std::string> args_raw;
 
 public:
        GetOpt();
        ~GetOpt();
 
-       /** Returns any non-option arguments encountered during processing.
-       Deprecated; use add_argument instead. */
-       DEPRECATED const std::vector<std::string> &get_args() const { return args_raw; }
-
        /** Adds an option with both short and long forms.  Processing depends on
        the type of the destination variable and whether an argument is taken or
        not.  With an argument, the value is lexical_cast to the appropriate type