X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fgetopt.h;h=56ab05123584ef83fcc51cd838802ef4a941c453;hb=79482ba7aea1b79c7a310c940cc0292532ef3bcb;hp=bb1bd1568f6dff403843e6bd57492bc0832fb21d;hpb=8aaeebd4a23bf19682564a3044fb5be4029fe82e;p=libs%2Fcore.git diff --git a/source/core/getopt.h b/source/core/getopt.h index bb1bd15..56ab051 100644 --- a/source/core/getopt.h +++ b/source/core/getopt.h @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspcore -Copyright © 2006-2009, 2011 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #ifndef MSP_CORE_GETOPT_H_ #define MSP_CORE_GETOPT_H_ @@ -72,6 +65,9 @@ private: template class Option: public OptBase { + private: + T &data; + public: Option(char s, const std::string &l, T &d, ArgType a): OptBase(s, l, a), data(d) { } @@ -88,13 +84,14 @@ private: throw usage_error("Invalid argument for --"+lng+" ("+e.what()+")"); } } - private: - T &data; }; template class ListOption: public OptBase { + private: + T &data; + public: ListOption(char s, const std::string &l, T &d, ArgType a): OptBase(s, l, a), data(d) { if(arg_type!=REQUIRED_ARG) throw std::invalid_argument("ListOption arg_type!=REQUIRED"); } @@ -112,8 +109,6 @@ private: throw usage_error("Invalid argument for --"+lng+" ("+e.what()+")"); } } - private: - T &data; }; bool help;