Changeset 2a301ff for libcfa/src/parseargs.cfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• libcfa/src/parseargs.cfa (modified) (1 diff)

libcfa/src/parseargs.cfa

@@ -230 +230 @@
 }
 
-void print_args_usage(cfa_option options[], size_t opt_count, const char * usage, bool error)  __attribute__ ((noreturn)) {
+void print_args_usage(cfa_option options[], const size_t opt_count, const char * usage, bool error)  __attribute__ ((noreturn)) {
         const array( cfa_option, opt_count ) & arr = (const array( cfa_option, opt_count ) &) *options;
         usage(cfa_args_argv[0], arr, usage, error ? stderr : stdout);
 }
 
-void print_args_usage(int , char * argv[], cfa_option options[], size_t opt_count, const char * usage, bool error)  __attribute__ ((noreturn)) {
+void print_args_usage(int , char * argv[], cfa_option options[], const size_t opt_count, const char * usage, bool error)  __attribute__ ((noreturn)) {
         const array( cfa_option, opt_count ) & arr = (const array( cfa_option, opt_count ) &) *options;
         usage(argv[0], arr, usage, error ? stderr : stdout);