diff options
Diffstat (limited to 'paludis/args/args_option.cc')
| -rw-r--r-- | paludis/args/args_option.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/paludis/args/args_option.cc b/paludis/args/args_option.cc index e9df5c670..821669daa 100644 --- a/paludis/args/args_option.cc +++ b/paludis/args/args_option.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -197,7 +197,7 @@ StringSetArg::StringSetArg(ArgsGroup * const g, const std::string & our_long_nam const char our_short_name, const std::string & our_description, const StringSetArgOptions & opts) : ArgsOption(g, our_long_name, our_short_name, our_description), - Pimp<StringSetArg>(), + _imp(), _validator(0) { std::copy(opts._imp->options.begin(), opts._imp->options.end(), @@ -208,7 +208,7 @@ StringSetArg::StringSetArg(ArgsGroup * const g, const std::string & our_long_nam const char our_short_name, const std::string & our_description, const StringSetArgOptions & opts, void (* v) (const std::string &)) : ArgsOption(g, our_long_name, our_short_name, our_description), - Pimp<StringSetArg>(), + _imp(), _validator(v) { std::copy(opts._imp->options.begin(), opts._imp->options.end(), @@ -287,7 +287,7 @@ namespace paludis StringSequenceArg::StringSequenceArg(ArgsGroup * const g, const std::string & our_long_name, const char our_short_name, const std::string & our_description) : ArgsOption(g, our_long_name, our_short_name, our_description), - Pimp<StringSequenceArg>() + _imp() { } @@ -389,7 +389,7 @@ namespace paludis } StringSetArg::StringSetArgOptions::StringSetArgOptions(const std::string & opt, const std::string & desc) : - Pimp<StringSetArgOptions>() + _imp() { _imp->options.push_back(std::make_pair(opt, desc)); } @@ -402,7 +402,7 @@ StringSetArg::StringSetArgOptions::operator() (const std::string & opt, const st } StringSetArg::StringSetArgOptions::StringSetArgOptions(const StringSetArg::StringSetArgOptions & o) : - Pimp<StringSetArgOptions>() + _imp() { std::copy(o._imp->options.begin(), o._imp->options.end(), std::back_inserter(_imp->options)); @@ -413,7 +413,7 @@ StringSetArg::StringSetArgOptions::~StringSetArgOptions() } StringSetArg::StringSetArgOptions::StringSetArgOptions() : - Pimp<StringSetArgOptions>() + _imp() { } @@ -446,7 +446,7 @@ EnumArg::~EnumArg() } EnumArg::EnumArgOptions::EnumArgOptions(const std::string & opt, const std::string & desc) : - Pimp<EnumArgOptions>() + _imp() { _imp->options.push_back(make_named_values<AllowedEnumArg>( n::description() = desc, @@ -456,7 +456,7 @@ EnumArg::EnumArgOptions::EnumArgOptions(const std::string & opt, const std::stri } EnumArg::EnumArgOptions::EnumArgOptions(const std::string & opt, const char s, const std::string & desc) : - Pimp<EnumArgOptions>() + _imp() { _imp->options.push_back(make_named_values<AllowedEnumArg>( n::description() = desc, @@ -495,7 +495,7 @@ EnumArg::EnumArg(ArgsGroup * const our_group, const std::string & our_long_name, const char our_short_name, const std::string & our_description, const EnumArgOptions & opts, const std::string & our_default_arg) : ArgsOption(our_group, our_long_name, our_short_name, our_description), - Pimp<EnumArg>(), + _imp(), _argument(our_default_arg), _default_arg(our_default_arg) { |