r189600 - in /branches/redhat/gcc-4_7-branch: ....

[jakub@gcc.gnu.org]

Author: jakub
Date: Wed Jul 18 07:10:48 2012
New Revision: 189600

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=189600
Log:
svn merge -r189498:189599 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch

Modified:
    branches/redhat/gcc-4_7-branch/libstdc++-v3/ChangeLog
    branches/redhat/gcc-4_7-branch/libstdc++-v3/config/os/gnu-linux/os_defines.h
    branches/redhat/gcc-4_7-branch/libstdc++-v3/include/bits/alloc_traits.h
    branches/redhat/gcc-4_7-branch/libstdc++-v3/include/bits/ptr_traits.h
    branches/redhat/gcc-4_7-branch/libstdc++-v3/include/ext/alloc_traits.h
    branches/redhat/gcc-4_7-branch/libstdc++-v3/include/ext/concurrence.h
    branches/redhat/gcc-4_7-branch/libstdc++-v3/include/ext/rope

Changes in other areas also in this revision:
Added:
    branches/redhat/gcc-4_7-branch/gcc/testsuite/g++.dg/parse/enum9.C
      - copied unchanged from r189599, branches/gcc-4_7-branch/gcc/testsuite/g++.dg/parse/enum9.C
    branches/redhat/gcc-4_7-branch/gcc/testsuite/g++.dg/template/array23.C
      - copied unchanged from r189599, branches/gcc-4_7-branch/gcc/testsuite/g++.dg/template/array23.C
    branches/redhat/gcc-4_7-branch/gcc/testsuite/g++.dg/template/current-inst1.C
      - copied unchanged from r189599, branches/gcc-4_7-branch/gcc/testsuite/g++.dg/template/current-inst1.C
Modified:
    branches/redhat/gcc-4_7-branch/   (props changed)
    branches/redhat/gcc-4_7-branch/gcc/DATESTAMP
    branches/redhat/gcc-4_7-branch/gcc/cp/ChangeLog
    branches/redhat/gcc-4_7-branch/gcc/cp/decl.c
    branches/redhat/gcc-4_7-branch/gcc/cp/parser.c
    branches/redhat/gcc-4_7-branch/gcc/cp/pt.c
    branches/redhat/gcc-4_7-branch/gcc/cp/tree.c
    branches/redhat/gcc-4_7-branch/gcc/testsuite/ChangeLog
    branches/redhat/gcc-4_7-branch/gcc/testsuite/g++.dg/parse/crash35.C

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