X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fgetopt.h;h=a1208f4c1fa9e423314225bb87e8fc91903149e8;hb=122846f0881673770d88eff7d925ecf25c01b62e;hp=3b579a664feff1caec0786de762b305647e5fe78;hpb=817e584903996a041692640720a5a272d847a3c7;p=libs%2Fcore.git

diff --git a/source/core/getopt.h b/source/core/getopt.h
index 3b579a6..a1208f4 100644
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -117,14 +117,14 @@ private:
 	class OptionImpl: public Option
 	{
 	protected:
-		char shrt;
+		char shrt = 0;
 		std::string lng;
-		ArgType arg_type;
-		unsigned seen_count;
-		unsigned *ext_seen_count;
+		ArgType arg_type = NO_ARG;
+		unsigned seen_count = 0;
+		unsigned *ext_seen_count = 0;
 		std::string help;
-		std::string metavar;
-		Store *store;
+		std::string metavar = "ARG";
+		Store *store = 0;
 
 	public:
 		OptionImpl(char, const std::string &, const Store &, ArgType);
@@ -147,9 +147,9 @@ private:
 	{
 	private:
 		std::string name;
-		ArgType type;
+		ArgType type = REQUIRED_ARG;
 		std::string help;
-		Store *store;
+		Store *store = 0;
 
 	public:
 		ArgumentImpl(const std::string &, const Store &, ArgType);
@@ -203,12 +203,9 @@ 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;
+	bool help = false;
+	std::vector<OptionImpl *> opts;
+	std::vector<ArgumentImpl *> args;
 	std::vector<std::string> args_raw;
 
 public: