aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>1999-12-05 20:04:37 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>1999-12-05 20:04:37 +0000
commitbccd95ae77d720ba9896b3278ee3d19ded2861da (patch)
treef0422abce4f23cae877eb5113fed99a3c390c44e
parent77cf4d553d2a28747a9c50363a73798107f7a4f3 (diff)
downloadgcc-bccd95ae77d720ba9896b3278ee3d19ded2861da.zip
gcc-bccd95ae77d720ba9896b3278ee3d19ded2861da.tar.gz
gcc-bccd95ae77d720ba9896b3278ee3d19ded2861da.tar.bz2
decl.c (init_decl_processing): Set flag_inline_trees if !flag_no_inline.
* decl.c (init_decl_processing): Set flag_inline_trees if !flag_no_inline. From-SVN: r30792
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/decl.c3
2 files changed, 6 insertions, 0 deletions
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 <mark@codesourcery.com>
+ * 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;