r161488 - in /branches/mem-ref2: ./ gcc/ChangeL...

[rguenth at gcc dot gnu dot org]

Author: rguenth
Date: Mon Jun 28 12:53:25 2010
New Revision: 161488

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=161488
Log:
2010-06-28  Richard Guenther  <rguenther@suse.de>

        Merge from trunk r161484.

Added:
    branches/mem-ref2/libstdc++-v3/include/bits/regex.h
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex.h
    branches/mem-ref2/libstdc++-v3/include/bits/regex_compiler.h
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex_compiler.h
    branches/mem-ref2/libstdc++-v3/include/bits/regex_constants.h
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex_constants.h
    branches/mem-ref2/libstdc++-v3/include/bits/regex_cursor.h
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex_cursor.h
    branches/mem-ref2/libstdc++-v3/include/bits/regex_error.h
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex_error.h
    branches/mem-ref2/libstdc++-v3/include/bits/regex_grep_matcher.h
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex_grep_matcher.h
    branches/mem-ref2/libstdc++-v3/include/bits/regex_grep_matcher.tcc
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex_grep_matcher.tcc
    branches/mem-ref2/libstdc++-v3/include/bits/regex_nfa.h
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex_nfa.h
    branches/mem-ref2/libstdc++-v3/include/bits/regex_nfa.tcc
      - copied unchanged from r161484, trunk/libstdc++-v3/include/bits/regex_nfa.tcc
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/02_definitions/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/02_definitions/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/03_requirements/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/03_requirements/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/04_header/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/04_header/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/05_constants/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/05_constants/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/06_exception_type/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/06_exception_type/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/07_traits/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/07_traits/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/08_basic_regex/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/08_basic_regex/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/09_sub_match/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/09_sub_match/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/10_match_results/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/10_match_results/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/11_algorithms/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/11_algorithms/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/12_iterators/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/12_iterators/
    branches/mem-ref2/libstdc++-v3/testsuite/28_regex/13_ecmascript/
      - copied from r161484, trunk/libstdc++-v3/testsuite/28_regex/13_ecmascript/
Modified:
    branches/mem-ref2/libstdc++-v3/ChangeLog
    branches/mem-ref2/libstdc++-v3/doc/html/faq.html
    branches/mem-ref2/libstdc++-v3/doc/xml/faq.xml
    branches/mem-ref2/libstdc++-v3/include/Makefile.am
    branches/mem-ref2/libstdc++-v3/include/Makefile.in
    branches/mem-ref2/libstdc++-v3/include/profile/impl/profiler_container_size.h
    branches/mem-ref2/libstdc++-v3/include/profile/impl/profiler_list_to_slist.h
    branches/mem-ref2/libstdc++-v3/include/profile/impl/profiler_trace.h
    branches/mem-ref2/libstdc++-v3/include/profile/impl/profiler_vector_to_list.h
    branches/mem-ref2/libstdc++-v3/include/std/regex
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/1.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/char/9.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
    branches/mem-ref2/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-1.cc
    branches/mem-ref2/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/1.cc
    branches/mem-ref2/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc
    branches/mem-ref2/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc
    branches/mem-ref2/libstdc++-v3/testsuite/util/testsuite_hooks.h

Changes in other areas also in this revision:
Added:
    branches/mem-ref2/gcc/testsuite/g++.dg/cpp0x/explicit5.C
      - copied unchanged from r161484, trunk/gcc/testsuite/g++.dg/cpp0x/explicit5.C
    branches/mem-ref2/gcc/testsuite/g++.dg/ipa/iinline-2.C
      - copied unchanged from r161484, trunk/gcc/testsuite/g++.dg/ipa/iinline-2.C
    branches/mem-ref2/gcc/testsuite/g++.dg/ipa/iinline-3.C
      - copied unchanged from r161484, trunk/gcc/testsuite/g++.dg/ipa/iinline-3.C
    branches/mem-ref2/gcc/testsuite/gcc.c-torture/compile/pr44686.c
      - copied unchanged from r161484, trunk/gcc/testsuite/gcc.c-torture/compile/pr44686.c
    branches/mem-ref2/gcc/testsuite/gcc.c-torture/execute/pr44683.c
      - copied unchanged from r161484, trunk/gcc/testsuite/gcc.c-torture/execute/pr44683.c
    branches/mem-ref2/gcc/testsuite/gcc.dg/opts-3.c
      - copied unchanged from r161484, trunk/gcc/testsuite/gcc.dg/opts-3.c
    branches/mem-ref2/gcc/testsuite/gcc.dg/pr44393.c
      - copied unchanged from r161484, trunk/gcc/testsuite/gcc.dg/pr44393.c
    branches/mem-ref2/gcc/testsuite/gcc.dg/pr44539.c
      - copied unchanged from r161484, trunk/gcc/testsuite/gcc.dg/pr44539.c
    branches/mem-ref2/gcc/testsuite/gcc.dg/pr44674.c
      - copied unchanged from r161484, trunk/gcc/testsuite/gcc.dg/pr44674.c
    branches/mem-ref2/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-1.c
      - copied unchanged from r161484, trunk/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-1.c
    branches/mem-ref2/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-2.c
      - copied unchanged from r161484, trunk/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-2.c
    branches/mem-ref2/gcc/testsuite/gfortran.dg/end_subroutine_1.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/end_subroutine_1.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/end_subroutine_2.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/end_subroutine_2.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/entry_19.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/entry_19.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/pr43866.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/pr43866.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/selected_real_kind_2.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/selected_real_kind_2.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/selected_real_kind_3.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/selected_real_kind_3.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/semicolon_fixed_2.f
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/semicolon_fixed_2.f
    branches/mem-ref2/gcc/testsuite/gfortran.dg/semicolon_free_2.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/semicolon_free_2.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/type_decl_1.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/type_decl_1.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/type_decl_2.f90
      - copied unchanged from r161484, trunk/gcc/testsuite/gfortran.dg/type_decl_2.f90
    branches/mem-ref2/gcc/testsuite/gnat.dg/noreturn3.adb
      - copied unchanged from r161484, trunk/gcc/testsuite/gnat.dg/noreturn3.adb
    branches/mem-ref2/gcc/testsuite/gnat.dg/noreturn3.ads
      - copied unchanged from r161484, trunk/gcc/testsuite/gnat.dg/noreturn3.ads
Removed:
    branches/mem-ref2/gcc/testsuite/gcc.dg/ipa/modif-1.c
Modified:
    branches/mem-ref2/   (props changed)
    branches/mem-ref2/gcc/ChangeLog
    branches/mem-ref2/gcc/ChangeLog.mem-ref2
    branches/mem-ref2/gcc/DATESTAMP
    branches/mem-ref2/gcc/Makefile.in
    branches/mem-ref2/gcc/ada/ChangeLog
    branches/mem-ref2/gcc/ada/gcc-interface/Make-lang.in
    branches/mem-ref2/gcc/ada/gcc-interface/misc.c
    branches/mem-ref2/gcc/ada/gcc-interface/trans.c
    branches/mem-ref2/gcc/c-family/ChangeLog
    branches/mem-ref2/gcc/c-family/c-ada-spec.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-ada-spec.h   (props changed)
    branches/mem-ref2/gcc/c-family/c-common.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-common.def   (props changed)
    branches/mem-ref2/gcc/c-family/c-common.h   (props changed)
    branches/mem-ref2/gcc/c-family/c-cppbuiltin.c   (contents, props changed)
    branches/mem-ref2/gcc/c-family/c-dump.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-format.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-format.h   (props changed)
    branches/mem-ref2/gcc/c-family/c-gimplify.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-lex.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-omp.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-opts.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-pch.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-ppoutput.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-pragma.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-pragma.h   (props changed)
    branches/mem-ref2/gcc/c-family/c-pretty-print.c   (props changed)
    branches/mem-ref2/gcc/c-family/c-pretty-print.h   (props changed)
    branches/mem-ref2/gcc/c-family/c-semantics.c   (props changed)
    branches/mem-ref2/gcc/c-family/c.opt   (props changed)
    branches/mem-ref2/gcc/c-family/stub-objc.c   (props changed)
    branches/mem-ref2/gcc/cgraph.c
    branches/mem-ref2/gcc/cgraph.h
    branches/mem-ref2/gcc/cgraphunit.c
    branches/mem-ref2/gcc/collect2.c
    branches/mem-ref2/gcc/common.opt
    branches/mem-ref2/gcc/config/alpha/alpha.c
    branches/mem-ref2/gcc/config/i386/i386-protos.h
    branches/mem-ref2/gcc/config/i386/i386.c
    branches/mem-ref2/gcc/config/i386/i386.h
    branches/mem-ref2/gcc/config/ia64/ia64-protos.h
    branches/mem-ref2/gcc/config/ia64/ia64.c
    branches/mem-ref2/gcc/config/ia64/ia64.h
    branches/mem-ref2/gcc/config/ia64/sysv4.h
    branches/mem-ref2/gcc/config/m32c/m32c-pragma.c
    branches/mem-ref2/gcc/config/m32c/m32c-protos.h
    branches/mem-ref2/gcc/config/m32c/m32c.c
    branches/mem-ref2/gcc/config/m32c/m32c.h
    branches/mem-ref2/gcc/config/m32c/predicates.md
    branches/mem-ref2/gcc/config/mips/mips.md
    branches/mem-ref2/gcc/config/pa/pa.h
    branches/mem-ref2/gcc/config/rs6000/linux64.h
    branches/mem-ref2/gcc/config/rs6000/rs6000.c
    branches/mem-ref2/gcc/config/rs6000/rs6000.h
    branches/mem-ref2/gcc/config/sparc/sparc-protos.h
    branches/mem-ref2/gcc/config/sparc/sparc.c
    branches/mem-ref2/gcc/cp/ChangeLog
    branches/mem-ref2/gcc/cp/Make-lang.in
    branches/mem-ref2/gcc/cp/call.c
    branches/mem-ref2/gcc/cp/cp-lang.c
    branches/mem-ref2/gcc/cp/cp-objcp-common.h
    branches/mem-ref2/gcc/cp/cp-tree.h
    branches/mem-ref2/gcc/cp/decl.c
    branches/mem-ref2/gcc/cp/decl2.c
    branches/mem-ref2/gcc/cp/except.c
    branches/mem-ref2/gcc/cp/expr.c
    branches/mem-ref2/gcc/cp/init.c
    branches/mem-ref2/gcc/cp/pt.c
    branches/mem-ref2/gcc/cp/semantics.c
    branches/mem-ref2/gcc/dbgcnt.def
    branches/mem-ref2/gcc/defaults.h
    branches/mem-ref2/gcc/doc/extend.texi
    branches/mem-ref2/gcc/doc/invoke.texi
    branches/mem-ref2/gcc/doc/md.texi
    branches/mem-ref2/gcc/doc/tm.texi
    branches/mem-ref2/gcc/dwarf2out.c
    branches/mem-ref2/gcc/dwarf2out.h
    branches/mem-ref2/gcc/except.c
    branches/mem-ref2/gcc/except.h
    branches/mem-ref2/gcc/fortran/ChangeLog
    branches/mem-ref2/gcc/fortran/Make-lang.in
    branches/mem-ref2/gcc/fortran/check.c
    branches/mem-ref2/gcc/fortran/decl.c
    branches/mem-ref2/gcc/fortran/dump-parse-tree.c
    branches/mem-ref2/gcc/fortran/gfortran.h
    branches/mem-ref2/gcc/fortran/gfortran.texi
    branches/mem-ref2/gcc/fortran/intrinsic.c
    branches/mem-ref2/gcc/fortran/intrinsic.h
    branches/mem-ref2/gcc/fortran/intrinsic.texi
    branches/mem-ref2/gcc/fortran/io.c
    branches/mem-ref2/gcc/fortran/libgfortran.h
    branches/mem-ref2/gcc/fortran/options.c
    branches/mem-ref2/gcc/fortran/parse.c
    branches/mem-ref2/gcc/fortran/simplify.c
    branches/mem-ref2/gcc/fortran/trans-decl.c
    branches/mem-ref2/gcc/fortran/trans-openmp.c
    branches/mem-ref2/gcc/fortran/trans-stmt.c
    branches/mem-ref2/gcc/gcc.c
    branches/mem-ref2/gcc/gimplify.c
    branches/mem-ref2/gcc/implicit-zee.c
    branches/mem-ref2/gcc/ipa-cp.c
    branches/mem-ref2/gcc/ipa-inline.c
    branches/mem-ref2/gcc/ipa-prop.c
    branches/mem-ref2/gcc/ipa-prop.h
    branches/mem-ref2/gcc/ipa-split.c
    branches/mem-ref2/gcc/ipa.c
    branches/mem-ref2/gcc/ira-int.h
    branches/mem-ref2/gcc/ira.c
    branches/mem-ref2/gcc/java/ChangeLog
    branches/mem-ref2/gcc/java/Make-lang.in
    branches/mem-ref2/gcc/java/except.c
    branches/mem-ref2/gcc/java/lang.c
    branches/mem-ref2/gcc/langhooks-def.h
    branches/mem-ref2/gcc/langhooks.h
    branches/mem-ref2/gcc/lto-symtab.c
    branches/mem-ref2/gcc/objc/ChangeLog
    branches/mem-ref2/gcc/objc/objc-act.c
    branches/mem-ref2/gcc/objcp/ChangeLog
    branches/mem-ref2/gcc/objcp/Make-lang.in
    branches/mem-ref2/gcc/objcp/objcp-lang.c
    branches/mem-ref2/gcc/omp-low.c
    branches/mem-ref2/gcc/opts.c
    branches/mem-ref2/gcc/params.def
    branches/mem-ref2/gcc/passes.c
    branches/mem-ref2/gcc/postreload.c
    branches/mem-ref2/gcc/reginfo.c
    branches/mem-ref2/gcc/reload.c
    branches/mem-ref2/gcc/reload.h
    branches/mem-ref2/gcc/reload1.c
    branches/mem-ref2/gcc/simplify-rtx.c
    branches/mem-ref2/gcc/system.h
    branches/mem-ref2/gcc/target-def.h
    branches/mem-ref2/gcc/target.h
    branches/mem-ref2/gcc/targhooks.c
    branches/mem-ref2/gcc/targhooks.h
    branches/mem-ref2/gcc/testsuite/ChangeLog
    branches/mem-ref2/gcc/testsuite/c-c++-common/Wint-to-pointer-cast-1.c   (props changed)
    branches/mem-ref2/gcc/testsuite/c-c++-common/Wint-to-pointer-cast-2.c   (props changed)
    branches/mem-ref2/gcc/testsuite/c-c++-common/Wint-to-pointer-cast-3.c   (props changed)
    branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/normalize-3.c   (props changed)
    branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/warning-directive-1.c   (props changed)
    branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/warning-directive-2.c   (props changed)
    branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/warning-directive-3.c   (props changed)
    branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/warning-directive-4.c   (props changed)
    branches/mem-ref2/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C   (props changed)
    branches/mem-ref2/gcc/testsuite/gfortran.dg/array_constructor_23.f
    branches/mem-ref2/gcc/testsuite/gfortran.dg/atan2_1.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/interface_proc_end.f90
    branches/mem-ref2/gcc/testsuite/gfortran.dg/semicolon_fixed.f
    branches/mem-ref2/gcc/testsuite/gfortran.dg/semicolon_free.f90
    branches/mem-ref2/gcc/timevar.def
    branches/mem-ref2/gcc/toplev.c
    branches/mem-ref2/gcc/toplev.h
    branches/mem-ref2/gcc/tree-cfg.c
    branches/mem-ref2/gcc/tree-cfgcleanup.c
    branches/mem-ref2/gcc/tree-eh.c
    branches/mem-ref2/gcc/tree-flow.h
    branches/mem-ref2/gcc/tree-if-conv.c
    branches/mem-ref2/gcc/tree-inline.c
    branches/mem-ref2/gcc/tree-loop-distribution.c
    branches/mem-ref2/gcc/tree-pass.h
    branches/mem-ref2/gcc/tree-ssa-alias.c
    branches/mem-ref2/gcc/tree-ssa-dom.c
    branches/mem-ref2/gcc/tree-ssa-loop-unswitch.c
    branches/mem-ref2/gcc/tree-ssa-loop.c
    branches/mem-ref2/gcc/tree.c
    branches/mem-ref2/libgfortran/ChangeLog
    branches/mem-ref2/libgfortran/gfortran.map
    branches/mem-ref2/libgfortran/intrinsics/selected_real_kind.f90
    branches/mem-ref2/libgfortran/io/list_read.c
    branches/mem-ref2/libgfortran/io/transfer.c
    branches/mem-ref2/libgfortran/mk-srk-inc.sh
    branches/mem-ref2/libgfortran/runtime/compile_options.c

Propchange: branches/mem-ref2/
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-ada-spec.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-ada-spec.h
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-common.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-common.def
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-common.h
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-cppbuiltin.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-dump.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-format.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-format.h
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-gimplify.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-lex.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-omp.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-opts.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-pch.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-ppoutput.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-pragma.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-pragma.h
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-pretty-print.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-pretty-print.h
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c-semantics.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/c.opt
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/c-family/stub-objc.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/c-c++-common/Wint-to-pointer-cast-1.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/c-c++-common/Wint-to-pointer-cast-2.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/c-c++-common/Wint-to-pointer-cast-3.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/normalize-3.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/warning-directive-1.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/warning-directive-2.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/warning-directive-3.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/c-c++-common/cpp/warning-directive-4.c
            ('svn:mergeinfo' modified)

Propchange: branches/mem-ref2/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C
            ('svn:mergeinfo' modified)