r172615 - in /branches/google/main: ./ ChangeLo...

[dnovillo at gcc dot gnu dot org]

Author: dnovillo
Date: Sun Apr 17 17:11:14 2011
New Revision: 172615

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=172615
Log:
	Merge from google/integration rev 172609.


Modified:
    branches/google/main/libstdc++-v3/include/bits/stl_algo.h
    branches/google/main/libstdc++-v3/include/bits/stl_tree.h
    branches/google/main/libstdc++-v3/include/bits/stl_vector.h
    branches/google/main/libstdc++-v3/include/ext/sso_string_base.h
    branches/google/main/libstdc++-v3/include/ext/vstring.h
    branches/google/main/libstdc++-v3/libsupc++/Makefile.am
    branches/google/main/libstdc++-v3/libsupc++/Makefile.in
    branches/google/main/libstdc++-v3/src/Makefile.am
    branches/google/main/libstdc++-v3/src/Makefile.in
    branches/google/main/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
    branches/google/main/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
    branches/google/main/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
    branches/google/main/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc

Changes in other areas also in this revision:
Modified:
    branches/google/main/   (props changed)
    branches/google/main/ChangeLog.google-integration
    branches/google/main/gcc/ChangeLog.google-main
    branches/google/main/gcc/testsuite/gcc.target/powerpc/ppc-round.c   (props changed)
    branches/google/main/libjava/classpath/   (props changed)

Propchange: branches/google/main/
            ('svn:mergeinfo' modified)

Propchange: branches/google/main/
            ('svnmerge-integrated' modified)

Propchange: branches/google/main/gcc/testsuite/gcc.target/powerpc/ppc-round.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/main/libjava/classpath/
            ('svn:mergeinfo' modified)