From 938ed7710ab15ad13f51bd17243cfe20cf8285eb Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 24 Aug 2007 14:27:18 -0400 Subject: STYLE: fix MSVC warnings by making the cmCommandArgumentsHelper a member of cmInstallCommandArguments instead of deriving from it Alex --- Source/cmInstallCommandArguments.cxx | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'Source/cmInstallCommandArguments.cxx') diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 91a00ce7b0..9cba5bf896 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -29,14 +29,14 @@ const char* cmInstallCommandArguments::PermissionsTable[] = const std::string cmInstallCommandArguments::EmptyString; cmInstallCommandArguments::cmInstallCommandArguments() -:cmCommandArgumentsHelper() +:Parser() ,ArgumentGroup() -,Destination (this, "DESTINATION" , &ArgumentGroup) -,Component (this, "COMPONENT" , &ArgumentGroup) -,Rename (this, "RENAME" , &ArgumentGroup) -,Permissions (this, "PERMISSIONS" , &ArgumentGroup) -,Configurations(this, "CONFIGURATIONS", &ArgumentGroup) -,Optional (this, "OPTIONAL" , &ArgumentGroup) +,Destination (&Parser, "DESTINATION" , &ArgumentGroup) +,Component (&Parser, "COMPONENT" , &ArgumentGroup) +,Rename (&Parser, "RENAME" , &ArgumentGroup) +,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup) +,Configurations(&Parser, "CONFIGURATIONS", &ArgumentGroup) +,Optional (&Parser, "OPTIONAL" , &ArgumentGroup) ,GenericArguments(0) { this->Component.SetDefaultString("Unspecified"); @@ -133,6 +133,13 @@ bool cmInstallCommandArguments::Finalize() return true; } +void cmInstallCommandArguments::Parse(const std::vector* args, + std::vector* unconsumedArgs) +{ + this->Parser.Parse(args, unconsumedArgs); +} + + bool cmInstallCommandArguments::CheckPermissions() { this->PermissionsString = ""; -- cgit v1.2.1