Merged across diffs between setup_crypto_branch_branchpoint and

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

diff --git a/libgetopt++/src/OptionSet.cc b/libgetopt++/src/OptionSet.cc
index fff13934926d7b24e6688b4e03bfc98cf05e865e..bc3f018b32d34cc529308252ca420e2a6f7c63a4 100644 (file)
--- a/libgetopt++/src/OptionSet.cc
+++ b/libgetopt++/src/OptionSet.cc
@@ -102,6 +102,7 @@ OptionSet::doOption(string &option, string::size_type const &pos)
     option.erase(0, pos);
     Option *theOption = findOption(option, pos);
     char const *optionValue = NULL;
+    string value;
 
     if (theOption == NULL)
        return;
@@ -114,8 +115,6 @@ OptionSet::doOption(string &option, string::size_type const &pos)
        break;
 
     case Option::Optional: {
-            string value;
-
             if (pos == 1) {
                 if (option.size() == 1) {
                     /* Value in next argv */
@@ -172,8 +171,6 @@ OptionSet::doOption(string &option, string::size_type const &pos)
        break;
 
     case Option::Required: {
-            string value;
-
             if (pos == 1) {
                 if (option.size() == 1) {
                     /* Value in next argv */