From 5882ce16ddc114a6c1ad081cb1f882b0978c9b4c Mon Sep 17 00:00:00 2001 From: mmitchel Date: Sun, 5 Dec 1999 20:04:37 +0000 Subject: [PATCH] * decl.c (init_decl_processing): Set flag_inline_trees if !flag_no_inline. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30792 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/decl.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 01ee076..2a007f8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 1999-12-05 Mark Mitchell + * decl.c (init_decl_processing): Set flag_inline_trees if + !flag_no_inline. + * cp-tree.h (calls_setjmp_p): Declare. * decl.c (finish_function): Mark functions that call setjmp as uninlinable. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 031e666..b6a62ea 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5968,10 +5968,13 @@ init_decl_processing () global_namespace = current_namespace; current_lang_name = NULL_TREE; + /* Adjust various flags based on command-line settings. */ if (flag_strict_prototype == 2) flag_strict_prototype = pedantic; if (! flag_permissive && ! pedantic) flag_pedantic_errors = 1; + if (!flag_no_inline) + flag_inline_trees = 1; strict_prototypes_lang_c = flag_strict_prototype; -- 2.7.4