* c.opt (-ftemplate-depth=): New.
(-ftemplate-depth-): Deprecate.
* optc-gen.awk: Handle -ftemplate-depth=.
* opth-gen.awk: Likewise.
* c-opts.c (c_common_handle_option): Likewise.
* doc/invoke.texi (-ftemplate-depth-): Replace with
-ftemplate-depth=.
cp/
* pt.c (push_tinst_level): Replace -ftemplate-depth- with
-ftemplate-depth=.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157054
138bc75d-0d04-0410-961f-
82ee72b054a4
+2010-02-24 Manuel López-Ibáñez <manu@gcc.gnu.org>
+
+ * c.opt (-ftemplate-depth=): New.
+ (-ftemplate-depth-): Deprecate.
+ * optc-gen.awk: Handle -ftemplate-depth=.
+ * opth-gen.awk: Likewise.
+ * c-opts.c (c_common_handle_option): Likewise.
+ * doc/invoke.texi (-ftemplate-depth-): Replace with
+ -ftemplate-depth=.
+
2010-02-24 Jason Merrill <jason@redhat.com>
* doc/invoke.texi: Improve -Wabi and -fabi-version docs.
break;
case OPT_ftemplate_depth_:
+ /* Kept for backwards compatibility. */
+ case OPT_ftemplate_depth_eq:
max_tinst_depth = value;
break;
-ftabstop=<number> Distance between tab stops for column reporting
ftemplate-depth-
+C++ ObjC++ Joined RejectNegative UInteger Undocumented
+
+ftemplate-depth=
C++ ObjC++ Joined RejectNegative UInteger
--ftemplate-depth-<number> Specify maximum template instantiation depth
+-ftemplate-depth=<number> Specify maximum template instantiation depth
fthis-is-variable
C++ ObjC++
+2010-02-24 Manuel López-Ibáñez <manu@gcc.gnu.org>
+
+ * pt.c (push_tinst_level): Replace -ftemplate-depth- with
+ -ftemplate-depth=.
+
2010-02-24 Jason Merrill <jason@redhat.com>
PR c++/12909
last_template_error_tick = tinst_level_tick;
error ("template instantiation depth exceeds maximum of %d (use "
- "-ftemplate-depth-NN to increase the maximum) instantiating %qD",
+ "-ftemplate-depth= to increase the maximum) instantiating %qD",
max_tinst_depth, d);
print_instantiation_context ();
error ("template instantiation depth exceeds maximum of %d"
" instantiating %q+D, possibly from virtual table generation"
- " (use -ftemplate-depth-NN to increase the maximum)",
+ " (use -ftemplate-depth= to increase the maximum)",
max_tinst_depth, decl);
if (TREE_CODE (decl) == FUNCTION_DECL)
/* Pretend that we defined it. */
-fno-nonansi-builtins -fno-operator-names @gol
-fno-optional-diags -fpermissive @gol
-fno-pretty-templates @gol
--frepo -fno-rtti -fstats -ftemplate-depth-@var{n} @gol
+-frepo -fno-rtti -fstats -ftemplate-depth=@var{n} @gol
-fno-threadsafe-statics -fuse-cxa-atexit -fno-weak -nostdinc++ @gol
-fno-default-inline -fvisibility-inlines-hidden @gol
-fvisibility-ms-compat @gol
Emit statistics about front-end processing at the end of the compilation.
This information is generally only useful to the G++ development team.
-@item -ftemplate-depth-@var{n}
+@item -ftemplate-depth=@var{n}
@opindex ftemplate-depth
Set the maximum instantiation depth for template classes to @var{n}.
A limit on the template instantiation depth is needed to detect
len = length (opts[i]);
enum = "OPT_" opts[i]
- if (opts[i] == "finline-limit=" || opts[i] == "Wlarger-than=")
+ if (opts[i] == "finline-limit=" || opts[i] == "Wlarger-than=" \
+ || opts[i] == "ftemplate-depth=")
enum = enum "eq"
gsub ("[^A-Za-z0-9]", "_", enum)
len = length (opts[i]);
enum = "OPT_" opts[i]
- if (opts[i] == "finline-limit=" || opts[i] == "Wlarger-than=")
+ if (opts[i] == "finline-limit=" || opts[i] == "Wlarger-than=" \
+ || opts[i] == "ftemplate-depth=")
enum = enum "eq"
if (opts[i] == "gdwarf+")
enum = "OPT_gdwarfplus"