aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/lex.c
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.co.uk>2003-06-07 11:10:46 +0000
committerNeil Booth <neil@gcc.gnu.org>2003-06-07 11:10:46 +0000
commit2772ef3ef33609dd64209323e9418a847685971a (patch)
tree924f51e62bf4028b92bc3030d4120771978f8a12 /gcc/cp/lex.c
parentf6749ed8d3a382fa8815a1481937d17591c89891 (diff)
downloadgcc-2772ef3ef33609dd64209323e9418a847685971a.zip
gcc-2772ef3ef33609dd64209323e9418a847685971a.tar.gz
gcc-2772ef3ef33609dd64209323e9418a847685971a.tar.bz2
Makefile.in (OJBS, c-opts.o): Update.
* Makefile.in (OJBS, c-opts.o): Update. (c-options.c, c-options.h): Rename options.h and options.c. (options.h): Rename options_.h. (opts.o): New. * c-common.h (c_common_handle_option): Replace c_common_decode_option. (c_common_init_options): Update prototype. * c-lang.c (c_init_options): Update prototype. (LANG_HOOKS_HANDLE_OPTION): Override. (LANG_HOOKS_DECODE_OPTION): Drop. * c-opts.c: Include opts.h and options.h instead of c-options.h and c-options.c. (lang_flags): Move to file scope. (find_opt, c_common_decode_option): Remove. (CL_C, CL_OBJC, CL_CXX, CL_OBJCXX, CL_JOINED, CL_SEPARATE, CL_REJECT_NEGATIVE): Move to opts.h. (missing_arg): Update prototype. (c_common_init_options): Update for new prototype. (c_common_handle_options): Filenames are passed as N_OPTS. * hooks.c (hook_int_void_0): New. * hooks.h (hook_int_void_0): New. * langhooks-def.h (LANG_HOOKS_INIT_OPTIONS): New default. (LANG_HOOKS_HANDLE_OPTION): Default to NULL for now. (LANG_HOOKS_INITIALIZER): Update. * langhooks.h (init_options): Update. (handle_option): New. * opts.c, opts.h: New files. * opts.sh: Update c file to include opts.h and options.h. * toplev.c: Include opts.h; change options.h to options_.h. (parse_options_and_default_flags): Get lang_mask, use handle_option for language-specific handling. * objc/objc-lang.c (LANG_HOOKS_DECODE_OPTON): Drop. (LANG_HOOKS_HANDLE_OPTION): Override. (objc_init_options): Update. ada: * misc.c (gnat_init_options): Update. cp: * cp-lang.c (LANG_HOOKS_DECODE_OPTON): Drop. (LANG_HOOKS_HANDLE_OPTION): Override. * cp-tree.h (cxx_init_options): Update. * lex.c (cxx_init_options): Update. f: * com.c (ffe_init_options): Update. java: * lang.c (java_init_options): Update. From-SVN: r67584
Diffstat (limited to 'gcc/cp/lex.c')
-rw-r--r--gcc/cp/lex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 816f9e3..2768452 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -150,11 +150,9 @@ int interface_unknown; /* whether or not we know this class
/* Initialization before switch parsing. */
-void
+int
cxx_init_options ()
{
- c_common_init_options (clk_cplusplus);
-
/* Default exceptions on. */
flag_exceptions = 1;
/* By default wrap lines at 80 characters. Is getenv ("COLUMNS")
@@ -163,6 +161,8 @@ cxx_init_options ()
/* By default, emit location information once for every
diagnostic message. */
diagnostic_prefixing_rule (global_dc) = DIAGNOSTICS_SHOW_PREFIX_ONCE;
+
+ return c_common_init_options (clk_cplusplus);
}
void