Changeset 1240

Timestamp:

2000-06-26T14:29:35+12:00 (24 years ago)

Author:

gwp

Message:

Resolved conflicts between previous two versions.

File:

• trunk/gsdl/perllib/parsargv.pm (modified) (2 diffs)

trunk/gsdl/perllib/parsargv.pm

@@ -72 +72 @@
     my %option;
 
-<<<<<<< parsargv.pm
     my @rest = @_;
 
@@ -93 +92 @@
     while (($spec, $var) = splice(@rest, 0, 2))
         {
-=======
-    # if the last argument is the string "allow_extra_options" then options
-    # in \@_ without a corresponding SPEC will be ignored (i.e. the "$arg is
-    # not a valid option" error won't occur)\n";
-    my $allow_extra_options = pop @_;
-    if (defined ($allow_extra_options)) {
-    if ($allow_extra_options eq "allow_extra_options") {
-        $allow_extra_options = 1;
-    } else {
-        # put it back where we got it
-        push (@_, $allow_extra_options);
-        $allow_extra_options = 0;
-    }
-    } else {
-    $allow_extra_options = 0;
-    }
-
-    while (($spec, $var) = splice(@_, 0, 2))
-    {
->>>>>>> 1.3
     die "Variable for $spec is not a valid type."
         unless ref($var) eq 'SCALAR' || ref($var) eq 'ARRAY';