diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:25:14 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:56:31 +0100 |
commit | 6313e1fe4c27755adde87e62db1c2f9fac534ae4 (patch) | |
tree | c57bb29f65e02fbfcc07895a8cc2903fff9300ba /src/3rdparty/v8/src/flags.cc | |
parent | b5a49a260d03249c386f1b63c249089383dd81fa (diff) | |
parent | cac65e7a222b848a735a974b0aeb43209b0cfa18 (diff) | |
download | qtjsbackend-6313e1fe4c27755adde87e62db1c2f9fac534ae4.tar.gz |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I892bbc73c276842894a720f761ce31ad1b015672
Diffstat (limited to 'src/3rdparty/v8/src/flags.cc')
-rw-r--r-- | src/3rdparty/v8/src/flags.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/3rdparty/v8/src/flags.cc b/src/3rdparty/v8/src/flags.cc index 5720cbd..bca0eff 100644 --- a/src/3rdparty/v8/src/flags.cc +++ b/src/3rdparty/v8/src/flags.cc @@ -31,7 +31,7 @@ #include "v8.h" #include "platform.h" -#include "smart-array-pointer.h" +#include "smart-pointers.h" #include "string-stream.h" @@ -343,6 +343,7 @@ static Flag* FindFlag(const char* name) { int FlagList::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) { + int return_code = 0; // parse arguments for (int i = 1; i < *argc;) { int j = i; // j > 0 @@ -368,7 +369,8 @@ int FlagList::SetFlagsFromCommandLine(int* argc, } else { fprintf(stderr, "Error: unrecognized flag %s\n" "Try --help for options\n", arg); - return j; + return_code = j; + break; } } @@ -382,7 +384,8 @@ int FlagList::SetFlagsFromCommandLine(int* argc, fprintf(stderr, "Error: missing value for flag %s of type %s\n" "Try --help for options\n", arg, Type2String(flag->type())); - return j; + return_code = j; + break; } } @@ -424,7 +427,8 @@ int FlagList::SetFlagsFromCommandLine(int* argc, fprintf(stderr, "Error: illegal value for flag %s of type %s\n" "Try --help for options\n", arg, Type2String(flag->type())); - return j; + return_code = j; + break; } // remove the flag & value from the command @@ -451,7 +455,7 @@ int FlagList::SetFlagsFromCommandLine(int* argc, exit(0); } // parsed all flags successfully - return 0; + return return_code; } |