r170444 - in /branches/redhat/gcc-4_6-branch: ....

[jakub at gcc dot gnu dot org]

Author: jakub
Date: Wed Feb 23 21:07:19 2011
New Revision: 170444

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=170444
Log:
svn merge -r170434:170441 svn+ssh://gcc.gnu.org/svn/gcc/trunk

Added:
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/pr46868.C
      - copied unchanged from r170441, trunk/gcc/testsuite/g++.dg/pr46868.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/objc.dg/attributes/objc-exception-1.m
      - copied unchanged from r170441, trunk/gcc/testsuite/objc.dg/attributes/objc-exception-1.m
Modified:
    branches/redhat/gcc-4_6-branch/   (props changed)
    branches/redhat/gcc-4_6-branch/gcc/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/cp/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/cp/parser.c
    branches/redhat/gcc-4_6-branch/gcc/objc/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/objc/objc-act.c
    branches/redhat/gcc-4_6-branch/gcc/objc/objc-act.h
    branches/redhat/gcc-4_6-branch/gcc/testsuite/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/conversion/op4.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/bracket1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/bracket2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/bracket4.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-data1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-data2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-ex2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-function1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-function3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/constexpr-object2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/decltype1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/decltype2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/decltype3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/decltype4.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/decltype5.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/decltype6.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mixed.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mutable.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-const.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nop.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-pass.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-recursive.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref-default.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/pr38646.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/pr39639.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/rvo.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic-bind.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic-crash2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic-function.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic-new.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic-new2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic-tuple.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic68.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic70.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/variadic73.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/vt-40092.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/expr/bound-mem-fun.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/expr/cond6.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/expr/stmt-expr-1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_assign.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_assign_odr.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_constructor.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_constructor_odr.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_copy-1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_copy-2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_copy-3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_copy-4.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_copy-5.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_copy-6.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_copy-7.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_nothrow_copy_odr.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_trivial_assign.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_trivial_constructor.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_trivial_copy.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_trivial_destructor-1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/has_virtual_destructor.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/is_abstract.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/is_base_of.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/is_class.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/is_empty.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/is_enum.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/is_pod.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/is_polymorphic.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/ext/is_union.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/inherit/covariant16.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/inherit/virtual7.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/init/aggr5.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/init/brace6.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/init/error2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/lookup/friend11.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/opt/pr19650.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/other/default2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/other/default3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/other/default5.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/other/dtor2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/other/friend5.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/other/pr47218.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/overload/defarg4.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/bitfield3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/constructor3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/crash34.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/crash35.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/crash40.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/crash56.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/ctor9.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/defarg12.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/dtor13.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/error14.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/error32.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/error33.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/error37.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/parameter-declaration-1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/struct-4.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/parse/template23.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/access19.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/call7.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-10.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-11.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-13.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-4.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-5.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-6.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-7.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/canon-type-9.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/const3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/init7.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/instantiate9.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/sfinae26.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/sizeof-template-argument.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/spec36.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/ttp22.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/typedef38.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/template/union2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/warn/Walways-true-1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/warn/Walways-true-2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/warn/Wlogical-op-1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/warn/Wreturn-type-6.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/Walways-true-1.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/Walways-true-2.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/Wlogical-op-1.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/parse-error-3.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/pr24225.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/struct-parse-2.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/tree-ssa/foldcast-1.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/tree-ssa/foldconst-2.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-2.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gfortran.dg/allocate_deferred_char_scalar_1.f03
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gfortran.dg/count_init_expr.f03
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gfortran.dg/gomp/pr43711.f90
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gnat.dg/opt11.adb
    branches/redhat/gcc-4_6-branch/gcc/testsuite/obj-c++.dg/exceptions-2.mm
    branches/redhat/gcc-4_6-branch/gcc/testsuite/obj-c++.dg/pr24393.mm
    branches/redhat/gcc-4_6-branch/gcc/testsuite/obj-c++.dg/pr45735.mm
    branches/redhat/gcc-4_6-branch/gcc/testsuite/objc.dg/pr24393.m
    branches/redhat/gcc-4_6-branch/gcc/testsuite/objc.dg/pr45735.m
    branches/redhat/gcc-4_6-branch/gcc/tree-if-conv.c

Propchange: branches/redhat/gcc-4_6-branch/
            ('svn:mergeinfo' modified)