Implement paired boolean options

[cygwin-apps/setup.git] / libgetopt++ / src / StringArrayOption.cc

diff --git a/libgetopt++/src/StringArrayOption.cc b/libgetopt++/src/StringArrayOption.cc
index 79ba88c1ee9c172603183643c4c88f5aa8679d4b..fe6f613176548201a4f5e4c3db50e7ba8700d2bc 100644 (file)
--- a/libgetopt++/src/StringArrayOption.cc
+++ b/libgetopt++/src/StringArrayOption.cc
@@ -14,10 +14,8 @@
 
 #include <getopt++/StringArrayOption.h>
 
-using namespace std;
-
 StringArrayOption::StringArrayOption(char shortopt,
-                      char const *longopt, string const &shorthelp,
+                      char const *longopt, std::string const &shorthelp,
                       OptionSet &owner) :
                       _optional(Required), _shortopt(shortopt),
                       _longopt (longopt), _shorthelp (shorthelp)
@@ -27,26 +25,26 @@ StringArrayOption::StringArrayOption(char shortopt,
 
 StringArrayOption::~ StringArrayOption () {};
 
-string const
+std::string const
 StringArrayOption::shortOption () const
 {
-  return string() + _shortopt + ":";
+  return std::string() + _shortopt + ":";
 }
 
-string const
+std::string const
 StringArrayOption::longOption () const
 {
   return _longopt;
 }
 
-string const
+std::string const
 StringArrayOption::shortHelp () const
 {
   return _shorthelp;
 }
 
 Option::Result
-StringArrayOption::Process (char const *optarg)
+StringArrayOption::Process (char const *optarg, int prefixIndex)
 {
   if (optarg)
     {
@@ -56,7 +54,7 @@ StringArrayOption::Process (char const *optarg)
   return Failed;
 }
 
-StringArrayOption::operator vector<string> () const
+StringArrayOption::operator std::vector<std::string> () const
 {
   return _value;
 }