X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fgetopt.h;h=a1208f4c1fa9e423314225bb87e8fc91903149e8;hb=30ce69b5cb05712c3a4903b0f397912119c4f1f9;hp=27ce4cf2fdb05824b3834eb0d972a7192ec3a1fd;hpb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8;p=libs%2Fcore.git

diff --git a/source/core/getopt.h b/source/core/getopt.h
index 27ce4cf..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,9 +203,9 @@ private:
 		{ data.push_back(lexical_cast<typename T::value_type>(a)); }
 	};
 
-	bool help;
-	std::list<OptionImpl *> opts;
-	std::list<ArgumentImpl *> args;
+	bool help = false;
+	std::vector<OptionImpl *> opts;
+	std::vector<ArgumentImpl *> args;
 	std::vector<std::string> args_raw;
 
 public: