OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
71,899 Commits 63 Branches 184 Tags 3.1 GiB
5de923eb8a
Commit Graph

71899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Peter Nilsson
c748a2c7c5 * gcc.dg/pack-test-1.c: Gate on ! default_packed. 
From-SVN: r106883
 2005-11-14 04:23:39 +00:00
Mark Mitchell
91b1ca65f3 re PR c++/20293 (Wrong diagnostic for ambiguous access) 
PR c++/20293
	* cxx-pretty-print.c (pp_cxx_statement): Print qualifying scopes
	for namespaces.
	(pp_cxx_original_namespace_definition): Likewise.
	* name-lookup.c (ambiguous_decl): Don't issue error messages;
	instead return lists of ambiguous candidates.
	(select_decl): Handle ambiguous namespace lookups.
	* parser.c (cp_token): Add ambiguous_p.
	(cp_lexer_get_preprocessor_token): Set it.
	(cp_parser_diagnose_invalid_type_name): Avoid duplicate messages
	when a qualified name uses an invalid scope. 
	(cp_parser_primary_expression): Print ambiguous candidates.
	(cp_parser_type_parameter): Adjust comment to reflect new
	parameter name for cp_parser_lookup_name.
	(cp_parser_template_argument): Likewise.
	(cp_parser_elaborated_type_specifier): Likewise.
	(cp_parser_namespace_name): Likewise.
	(cp_parser_class_name): Print ambiguous candidates.
	(cp_parser_lookup_name): Rename ambiguous_p parameter to
	ambiguous_decls.  Use it to return a list of ambiguous candiates
	when a lookup is ambiguous.
	(cp_parser_lookup_name_simple): Adjust comment to reflect new
	parameter name for cp_parser_lookup_name.
	
	PR c++/20293
	* g++.dg/parse/ambig4.C: New test.
	* g++.dg/tc1/dr101.C: Adjust error markers.
	* g++.dg/lookup/strong-using-2.C: Likewise.
	* g++.dg/lookup/ambig5.C: Likewise.
	* g++.dg/lookup/ambig4.C: Likewise.
	* g++.dg/parse/crash22.C: Likewise.

From-SVN: r106879
 2005-11-14 01:45:19 +00:00
Hans-Peter Nilsson
43258b67a9 * gcc.dg/pr19340.c: Skip for mmix-*-* and cris-*-*. 
From-SVN: r106877
 2005-11-14 01:04:09 +00:00
GCC Administrator
a334b64ca5 Daily bump. 
From-SVN: r106874
 2005-11-14 00:17:15 +00:00
John David Anglin
5dcc96058c pa.c (store_reg): Revise generation of frame notes in large frames. 
* pa.c (store_reg): Revise generation of frame notes in large frames.
	(set_reg_plus_d): Likewise.

From-SVN: r106867
 2005-11-13 18:06:55 +00:00
Andrew MacLeod
e84d806450 re PR tree-optimization/24709 (4.1.0 HEAD crashes with enable-checking on huge switch statement) 
PR tree-optimization/24709
	* tree-ssa-operands.c (verify_imm_links): Increase limit for infinite
	loop check.

From-SVN: r106865
 2005-11-13 16:09:14 +00:00
Paolo Carlini
81daf4baea [multiple changes] 
2005-11-13  Jonathan Wakely  <redi@gcc.gnu.org>

	* include/tr1/boost_shared_ptr.h (get_deleter):
	Declare before shared_ptr.
	(shared_ptr<>): Declare get_deleter as friend.
	(shared_ptr<>:_M_get_deleter): Private.

2005-11-13  Douglas Gregor  <doug.gregor@gmail.com>

	PR libstdc++/24818
        * include/tr1/ref_wrap_iterate.h
        (reference_wrapper::operator()()): Don't dereferene the result of
        get() before calling it; it's already a reference.
        * testsuite/tr1/3_function_objects/reference_wrapper/invoke.cc:
        Test nullary calls to reference_wrappers.

From-SVN: r106863
 2005-11-13 12:14:51 +00:00
Paolo Carlini
3270a66b55 [multiple changes] 
2005-11-13  Jonathan Wakely  <redi@gcc.gnu.org>

	* include/tr1/boost_shared_ptr.h (get_deleter):
	Declare before shared_ptr.
	(shared_ptr<>): Declare get_deleter as friend.
	(shared_ptr<>:_M_get_deleter): Private.

2005-11-13  Douglas Gregor  <doug.gregor@gmail.com>

	PR libstdc++/24818
        * include/tr1/ref_wrap_iterate.h
        (reference_wrapper::operator()()): Don't dereferene the result of
        get() before calling it; it's already a reference.
        * testsuite/tr1/3_function_objects/reference_wrapper/invoke.cc:
        Test nullary calls to reference_wrappers.

From-SVN: r106862
 2005-11-13 12:14:15 +00:00
Eric Botcazou
7a9018e45b gthr-posix95.h: Remove declaration of pthread_mutexattr_settype and duplicate declaration of... 
* gthr-posix95.h: Remove declaration of pthread_mutexattr_settype
	and duplicate declaration of pthread_self.

From-SVN: r106861
 2005-11-13 10:16:43 +00:00
Eric Botcazou
51caaefe17 re PR middle-end/24003 (17 ACATS regressions (fixed point or decimal artihmetic)) 
PR middle-end/24003
	* calls.c (expand_call): If TARGET is a MEM and some part of the
	argument area has been saved, force TARGET to a register.


Co-Authored-By: Ian Lance Taylor <ian@airs.com>

From-SVN: r106860
 2005-11-13 09:55:11 +00:00
Francois-Xavier Coudert
5d723e5434 fget.c: New file. 
* intrinsics/fget.c: New file.
	* intrinsics/ftell.c: New file.
	* io/unix.c (stream_offset): New function.
	* io/io.h: Add prototype for stream_offset.
	* Makefile.am: Add intrinsics/fget.c and intrinsics/ftell.c.
	* Makefile.in: Regenerate.

	* intrinsic.c (add_functions): Add COMPLEX, FTELL, FGETC, FGET,
	FPUTC, FPUT, AND, XOR and OR intrinsic functions.
	(add_subroutines): Add FGETC, FGET, FPUTC, FPUT and FTELL intrinsic
	subroutines.
	* gfortran.h: Add GFC_ISYM_AND, GFC_ISYM_COMPLEX, GFC_ISYM_FGET,
	GFC_ISYM_FGETC, GFC_ISYM_FPUT, GFC_ISYM_FPUTC, GFC_ISYM_FTELL,
	GFC_ISYM_OR, GFC_ISYM_XOR.
	* iresolve.c (gfc_resolve_and, gfc_resolve_complex,
	gfc_resolve_or, gfc_resolve_fgetc, gfc_resolve_fget,
	gfc_resolve_fputc, gfc_resolve_fput, gfc_resolve_ftell,
	gfc_resolve_xor, gfc_resolve_fgetc_sub, gfc_resolve_fget_sub,
	gfc_resolve_fputc_sub, gfc_resolve_fput_sub, gfc_resolve_ftell_sub):
	New functions.
	* check.c (gfc_check_complex, gfc_check_fgetputc_sub,
	gfc_check_fgetputc, gfc_check_fgetput_sub, gfc_check_fgetput,
	gfc_check_ftell, gfc_check_ftell_sub, gfc_check_and): New functions.
	* simplify.c (gfc_simplify_and, gfc_simplify_complex, gfc_simplify_or,
	gfc_simplify_xor): New functions.
	* trans-intrinsic.c (gfc_conv_intrinsic_function): Add cases for
	GFC_ISYM_AND, GFC_ISYM_COMPLEX, GFC_ISYM_FGET, GFC_ISYM_FGETC,
	GFC_ISYM_FPUT, GFC_ISYM_FPUTC, GFC_ISYM_FTELL, GFC_ISYM_OR and
	GFC_ISYM_XOR.
	* intrinsic.h: Add prototypes for all functions added to iresolve.c,
	simplify.c and check.c.

	* gfortran.dg/complex_intrinsic_1.f90: New test.
	* gfortran.dg/complex_intrinsic_2.f90: New test.
	* gfortran.dg/fgetc_1.f90: New test.
	* gfortran.dg/fgetc_2.f90: New test.
	* gfortran.dg/fgetc_3.f90: New test.
	* gfortran.dg/ftell_1.f90: New test.
	* gfortran.dg/ftell_2.f90: New test.
	* gfortran.dg/gnu_logical_1.F: New test.
	* gfortran.dg/gnu_logical_2.f90: New test.

From-SVN: r106859
 2005-11-13 09:33:19 +00:00
Razya Ladelsky
a8bd670c5a ipa-prop.c (ipa_callsite_compute_param ): Removed obsolete type checking. 
2005-11-13  Razya Ladelsky <razya@il.ibm.com>

        * ipa-prop.c (ipa_callsite_compute_param ): Removed obsolete type
        checking.

From-SVN: r106858
 2005-11-13 09:08:42 +00:00
Andreas Jaeger
42068fd90a check.tpl: Handle CVS additionally. 
* check.tpl: Handle CVS additionally.

From-SVN: r106855
 2005-11-13 09:43:28 +01:00
Jason Merrill
d3e4cd0137 re PR c++/22489 (ICE in dwarf2out_finish with using namespace in a local class and compiler built constructors) 
PR c++/22489
        * dwarf2out.c (gen_subprogram_die): Force a declaration die for
        lazily declared methods.
        (force_decl_die): Stop if forcing out the context already make a
        DIE for the decl.
        (force_type_die): Likewise.

From-SVN: r106853
 2005-11-13 02:34:50 -05:00
Andrew Pinski
646c38e94e re PR middle-end/24820 (SEGV in integer_valued_real_p at gcc/builtins.c:6711) 
2005-11-13  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/24820
        * testsuite/gcc.dg/pr24820.c: New test.
2005-11-13  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/24820
        * builtins.c (integer_valued_real_p): Add break in
        REAL_CST having TREE_OVERFLOW set.

From-SVN: r106851
 2005-11-12 22:18:48 -08:00
GCC Administrator
a8db974a4a Daily bump. 
From-SVN: r106847
 2005-11-13 00:17:13 +00:00
Zdenek Dvorak
85a43114c9 tree-ssa-loop-ivopts.c (get_address_cost): Prevent splitting addressing modes during calculation of costs. 
* tree-ssa-loop-ivopts.c (get_address_cost): Prevent splitting
	addressing modes during calculation of costs.

	* testsuite/gcc.dg/tree-ssa/loop-2.c: Fix outcome.
	* testsuite/gcc.dg/tree-ssa/loop-3.c: Change type of loop control
	variable.

From-SVN: r106842
 2005-11-12 23:27:13 +00:00
Eric Botcazou
4cfe2e7514 function.c (assign_stack_local_1): Restrict sanity check on frame size overflow to 32-bit and above platforms. 
* function.c (assign_stack_local_1): Restrict sanity check
	on frame size overflow to 32-bit and above platforms.

From-SVN: r106840
 2005-11-12 22:58:48 +00:00
John David Anglin
86b5dedbee nested-func-4.c: Add dg-options for hppa*-*-hpux*. 
testsuite/24614
	* gcc.dg/nested-func-4.c: Add dg-options for hppa*-*-hpux*.

From-SVN: r106837
 2005-11-12 21:54:23 +00:00
Hans-Peter Nilsson
fa7682c729 cris.exp: New file. 
* gcc.target/cris/cris.exp: New file.
	* gcc.target/cris/rld-legit1.c: New test.
	* gcc.target/cris/rld-legit2.c: New test.

From-SVN: r106836
 2005-11-12 21:10:23 +00:00
Hans-Peter Nilsson
15883505db cris.h (LEGITIMIZE_RELOAD_ADDRESS): Define. 
* config/cris/cris.h (LEGITIMIZE_RELOAD_ADDRESS): Define.
	* config/cris/cris.c: Include reload.h.
	(cris_initial_elimination_offset): New function.
	* config/cris/cris-protos.h: (cris_initial_elimination_offset):
	Prototype.

From-SVN: r106835
 2005-11-12 21:09:11 +00:00
Jakub Jelinek
73bebd55f0 re PR c++/24780 (ICE set_mem_attributes_minus_bitpos) 
PR c++/24780
	* typeck.c (complete_type): Set TYPE_NEEDS_CONSTRUCTING
	and TYPE_HAS_NONTRIVIAL_DESTRUCTOR flags for all variants
	of array type.

	* g++.dg/opt/pr24780.C: New test.

From-SVN: r106833
 2005-11-12 21:44:55 +01:00
Jakub Jelinek
f74dcfb701 re PR c++/24761 (templates and inline-asm and "+") 
PR c++/24761
	* pt.c (tsubst_copy_asm_operands): New function.
	(tsubst_expr) <case ASM_EXPR>: Use it.

	* g++.dg/template/asm1.C: New test.

From-SVN: r106831
 2005-11-12 21:42:23 +01:00
Richard Guenther
6375779a59 gcse.c (find_rtx_in_ldst): Handle NULL pre_ldst_table. 
2005-11-12  Richard Guenther  <rguenther@suse.de>

	* gcse.c (find_rtx_in_ldst): Handle NULL pre_ldst_table.

From-SVN: r106829
 2005-11-12 19:29:30 +00:00
Steven G. Kargl
02c92593ed re PR libfortran/24787 ([libfortran] SCAN is broken) 
PR libfortran/24787
* intrinsics/string_intrinsics.c (string_scan): Off by one; Fix
  typos in nearby comment.

* gfortran.dg/scan_1.f90: New test.

From-SVN: r106828
 2005-11-12 19:16:40 +00:00
Jan Hubicka
230dedb327 expr.c (expand_expr_real_1): <MAX_EXPR, MIN_EXPR>: Canonicalize to compare against 0 when possible. 
* expr.c (expand_expr_real_1): <MAX_EXPR, MIN_EXPR>: Canonicalize
	to compare against 0 when possible.
	* gcc.target/i386/minmax-1.c: New.
	* gcc.target/i386/minmax-2.c: New.

From-SVN: r106827
 2005-11-12 17:35:06 +00:00
Jie Zhang
df25924573 bfin.h (REGISTER_NAMES, [...]): Rearrange I/B/L registers. 
* config/bfin/bfin.h (REGISTER_NAMES, SHORT_REGISTER_NAMES,
	HIGH_REGISTER_NAMES, FIXED_REGISTERS, CALL_USED_REGISTERS,
	REG_ALLOC_ORDER, enum reg_class): Rearrange I/B/L registers.
	* config/bfin/bfin.md: Redefine REG_ constants for I/B/L registers
	in the new order.

From-SVN: r106824
 2005-11-12 16:08:35 +00:00
Kaz Kojima
1f02bd2611 pr24445.c: Fix for 64-bit targets. 
* gcc.dg/pr24445.c: Fix for 64-bit targets.

From-SVN: r106822
 2005-11-12 09:28:24 +00:00
Hans-Peter Nilsson
74e3e54a6c recog.c (constrain_operands): For a match, require that a non-register matches general_operand when strict >= 0. 
* recog.c (constrain_operands) <case 'g'>: For a match, require
	that a non-register matches general_operand when strict >= 0.

From-SVN: r106821
 2005-11-12 07:12:09 +00:00
Paolo Carlini
516ebd4486 re PR libstdc++/24808 (is_object fails to compile with incomplete types) 
2005-11-11  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/24808
	* include/tr1/type_traits (__is_abstract_helper): Rename to __in_array
	(with complemented logic).
	(is_function): Use it, don't use __conv_helper.
	(is_abstract): Adjust.
	(__conv_helper): Rename to __is_convertible_simple.
	(is_convertible): Adjust.
	* testsuite/testsuite_tr1.h (class IncompleteClass): Add.
	* testsuite/tr1/4_metaprogramming/composite_type_traits/is_object/
	24808.cc: New.
	* testsuite/tr1/4_metaprogramming/primary_type_categories/is_enum/
	24808.cc: Likewise.
	* testsuite/tr1/4_metaprogramming/primary_type_categories/is_function/
	24808.cc: Likewise.

From-SVN: r106818
 2005-11-12 00:19:24 +00:00
GCC Administrator
02b3514c84 Daily bump. 
From-SVN: r106815
 2005-11-12 00:17:06 +00:00
Steven Bosscher
b644b21144 loop-invariant.c (move_loop_invariants): Fix a thinko in the previous checkin. 
* loop-invariant.c (move_loop_invariants): Fix a thinko in the
	previous checkin.

From-SVN: r106809
 2005-11-12 00:09:48 +00:00
Daniel Jacobowitz
6c14b137a9 gcc/ 
* tree-ssa-dse.c (struct address_walk_data, memory_ssa_name_same)
	(memory_address_same): New.
	(dse_optimize_stmt): Call memory_address_same.
gcc/testsuite/
	* gcc.c-torture/execute/20051110-1.c,
	gcc.c-torture/execute/20051110-2.c: New tests.

From-SVN: r106807
 2005-11-11 23:23:15 +00:00
Hans-Peter Nilsson
44087d555c re PR middle-end/24750 (global-alloc (reload) trips over own confusion for unexpected addressing modes) 
PR middle-end/24750
	* gcc.dg/torture/pr24750-1.c, gcc.target/cris/torture/pr24750-2.c:
        New tests.

From-SVN: r106806
 2005-11-11 23:19:26 +00:00
Hans-Peter Nilsson
19fe122f94 re PR middle-end/24750 (global-alloc (reload) trips over own confusion for unexpected addressing modes) 
PR middle-end/24750
	* reload.c (find_reloads_address_1) <case TRUNCATE, SIGN_EXTEND,
	ZERO_EXTEND>: New cases.

From-SVN: r106804
 2005-11-11 23:17:16 +00:00
Daniel Jacobowitz
b4f05423f4 * longlong.h (__clz_tab): Always provide. 
From-SVN: r106803
 2005-11-11 22:45:06 +00:00
Andreas Tobler
2e58f31191 target-libpath.exp (get_shlib_extension): New proc. 
2005-11-11  Andreas Tobler  <a.tobler@schweiz.ch>

	* lib/target-libpath.exp (get_shlib_extension): New proc.
	* lib/g++.exp (g++_link_flags): Add flags in case of shared only build.
	* lib/gfortran.exp (gfortran_link_flags): Likewise.
	* lib/objc.exp (objc_target_compile): Likewise.
	* lib/obj-c++.exp (obj-c++_link_flags): Likewise. Fix multilib libgcc
	detection.

From-SVN: r106802
 2005-11-11 23:31:35 +01:00
Daniel Jacobowitz
ef9db8d5dd Makefile.def: Remove gdb dependencies for gdbtk. 
* Makefile.def: Remove gdb dependencies for gdbtk.
	* Makefile.tpl (CONFIGURE_GDB_TK, INSTALL_GDB_TK): New variables.
	(configure-gdb, install-gdb): New rules.
	* configure.in: Set CONFIGURE_GDB_TK and INSTALL_GDB_TK.
	* Makefile.in, configure: Regenerated.

From-SVN: r106801
 2005-11-11 21:47:07 +00:00
Andreas Tobler
5bd9e94d23 static_linking_1.f: Fix static_libgfortran processing. 
2005-11-11  Andreas Tobler  <a.tobler@schweiz.ch>

	* gfortran.dg/static_linking_1.f: Fix static_libgfortran processing.

	* lib/target-supports.exp (check_effective_target_static_libgfortran):
	Add -static to additional_flags and pass it to target_compile.

From-SVN: r106800
 2005-11-11 22:41:55 +01:00
Jerry DeLisle
21df8673c5 Update ChangeLog. 
2005-11-11  Jerry DeLisle <jvdelisle@gcc.gnu.org>

	Update ChangeLog. Forgot to commit

From-SVN: r106799
 2005-11-11 20:35:54 +00:00
Jerry DeLisle
2999dd1780 re PR libfortran/24719 (Nonadvancing read does not read more than 1 line) 
2005-11-11  Jerry DeLisle <jvdelisle@gcc.gnu.org>

	PR libgfortran/24719
	gfortran.dg/read_noadvance.f90: New test.
	
	PR libgfortran/24699
	gfortran.dg/fmt_t_2.f90: New test.
	
	PR libgfortran/24785
	gfortran.dg/read_x_eor.f90: New test.
	
	PR libgfortran/24584
	gfortran.dg/namelist_empty.f90: Rename test.

	PR libgfortran/24489
	gfortran/read_eor.f90: Rename test.

From-SVN: r106798
 2005-11-11 20:31:06 +00:00
Jerry DeLisle
740f04ef02 PR libgfortran/24699, 24700, 24719, 24785 
2005-11-09  Jerry DeLisle <jvdelisle@gcc.gnu.org>

	PR libgfortran/24699, 24700, 24719, 24785
	* io/transfer.c (read_sf): Remove incorrect statement that was
	clearing bytes_left.
	(formatted_transfer_scalar): Add handling of end-of-record
	condition, setting values correctly to backup.  Handle x format
	when doing non-advancing write.
	(st_read): Initialize current_record.

From-SVN: r106797
 2005-11-11 20:19:21 +00:00
Paolo Carlini
77633f4cd0 re PR libstdc++/24799 (std::tr1::hash missing inheritance) 
2005-11-11  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/24799
	* include/tr1/functional (hash): Inherit from std::unary_function.
	* testsuite/tr1/6_containers/unordered/hash/24799.cc: New.

	PR libstdc++/24805
	* include/tr1/boost_shared_ptr.h (swap(shared_ptr<>&, shared_ptr<>&),
	swap(weak_ptr<>&, weak_ptr<>&)): Move inside namespace tr1.
	* testsuite/tr1/2_general_utilities/memory/shared_ptr/modifiers/
	24805.cc: New.

	PR libstdc++/24809
	* include/tr1/type_traits (__is_polymorhpic_helper): Adjust destructor.
	* testsuite/tr1/4_metaprogramming/type_properties/is_polymorphic/
	24809.cc: New.

From-SVN: r106796
 2005-11-11 20:10:20 +00:00
Steven Bosscher
a7f4ccb197 re PR target/24265 (ICE: in extract_insn, at recog.c:2084 with -O -fgcse -fmove-loop-invariants -mtune=pentiumpro) 
PR 24265
	* loop-invariant.c (may_assign_reg_p): Make sure a hard register
	can be assigned to.
	(find_invariant_insn): Do the cheapest check, may_assign_reg_p,
	before check_maybe_invariant.
	(move_invariant_reg): Use gen_move_insn instead of replacing
	SET_DEST with the temporary for the invariant.
	(move_loop_invariants): If checking is enabled, do internal
	consistency checks after completing the pass.

From-SVN: r106795
 2005-11-11 19:34:39 +00:00
David Edelsohn
d35a40fca5 re PR c/24644 (gcc-4.1 compiled ppc64 kernels do not boot) 
PR 24644
        * common.opt (Wvolatile-register-var): New.
        * varasm.c (make_decl_rtl): Only emit warning when option
        specified.  Clarify warning message.
        * doc/invoke.texi (Wvolatile-register-var): Document new option.

        * doc/md.texi (copysign): Document standard named pattern.

From-SVN: r106791
 2005-11-11 12:59:54 -05:00
Jie Zhang
51a641fdb2 bfin.c (bfin_expand_strmov): Correctly move the trailing bytes when align is 2. 
* config/bfin/bfin.c (bfin_expand_strmov): Correctly move the trailing
	bytes when align is 2.
	* config/bfin/bfin.md (rep_movsi, rep_movhi): Make LSETUP be followed
	by the first instruction of the loop.

From-SVN: r106790
 2005-11-11 17:58:31 +00:00
Jason Merrill
47b266bdfe fix 
From-SVN: r106788
 2005-11-11 12:16:53 -05:00
Jason Merrill
422dfbc43f re PR c++/24686 (ICE when building a variation of NMSTL) 
PR c++/24686
        * gimplify.c (gimplify_cleanup_point_expr): Also save and restore
        the cleanup list.

From-SVN: r106787
 2005-11-11 12:15:48 -05:00
Jason Merrill
df77f45463 re PR c++/24686 (ICE when building a variation of NMSTL) 
PR c++/24686
        * gimplify.c (gimplify_cleanup_point_expr): Also save and restore
        the cleanup list.

From-SVN: r106786
 2005-11-11 12:14:49 -05:00
Zdenek Dvorak
301a8f9577 re PR rtl-optimization/22509 (elemental.f90 testsuite failure (-fweb)) 
PR rtl-optimization/22509
	* local-alloc.c (memref_used_between_p): Check whether a function call
	could not reference the memref.

From-SVN: r106783
 2005-11-11 13:38:07 +00:00