r229178 - in /branches/gomp-4_0-branch: ./ incl...

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Thu Oct 22 17:50:08 2015
New Revision: 229178

URL: https://gcc.gnu.org/viewcvs?rev=229178&root=gcc&view=rev
Log:
svn merge -r 224607:224838 svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_1-branch

Modified:
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/20_util/is_nothrow_swappable/requirements/explicit_instantiation.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/20_util/is_nothrow_swappable/requirements/typedefs.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/absolute.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/current_path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/exists.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/file_size.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/status.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/temp_directory_path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/append/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/append/path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/assign/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/assign/assign.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/assign/copy.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/compare/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/compare/compare.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/compare/path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/compare/strings.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/concat/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/concat/path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/concat/strings.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/copy.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/default.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/locale.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/range.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/extension.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/filename.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/parent_path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/relative_path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/root_directory.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/root_name.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/root_path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/stem.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/generic/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/generic/generic_string.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/itr/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/itr/traversal.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/clear.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/make_preferred.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/remove_filename.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/replace_extension.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/replace_filename.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/swap.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/nonmember/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/nonmember/hash_value.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/empty.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_extension.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_filename.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_parent_path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_relative_path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_root_directory.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_root_name.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_root_path.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_stem.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/is_relative.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/assignment/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/assignment/assign.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/cons/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/cons/cons.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/hash/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/hash/hash.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/make_observer.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/relops/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/relops/relops.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/requirements.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/swap/   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/swap/swap.cc   (props changed)
    branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/typedefs.cc   (props changed)

Changes in other areas also in this revision:
Added:
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/target-11.c
      - copied unchanged from r224838, branches/gomp-4_1-branch/libgomp/testsuite/libgomp.c/target-11.c
Modified:
    branches/gomp-4_0-branch/   (props changed)
    branches/gomp-4_0-branch/include/ChangeLog.gomp41
    branches/gomp-4_0-branch/include/gomp-constants.h
    branches/gomp-4_0-branch/libgomp/ChangeLog.gomp41
    branches/gomp-4_0-branch/libgomp/libgomp.h
    branches/gomp-4_0-branch/libgomp/oacc-mem.c
    branches/gomp-4_0-branch/libgomp/oacc-parallel.c
    branches/gomp-4_0-branch/libgomp/target.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/20_util/is_nothrow_swappable/requirements/explicit_instantiation.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/20_util/is_nothrow_swappable/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/absolute.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/current_path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/exists.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/file_size.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/status.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/operations/temp_directory_path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/append/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/append/path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/assign/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/assign/assign.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/assign/copy.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/compare/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/compare/compare.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/compare/path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/compare/strings.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/concat/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/concat/path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/concat/strings.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/copy.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/default.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/locale.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/construct/range.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/extension.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/filename.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/parent_path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/relative_path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/root_directory.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/root_name.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/root_path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/decompose/stem.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/generic/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/generic/generic_string.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/itr/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/itr/traversal.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/clear.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/make_preferred.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/remove_filename.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/replace_extension.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/replace_filename.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/modifiers/swap.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/nonmember/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/nonmember/hash_value.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/empty.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_extension.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_filename.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_parent_path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_relative_path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_root_directory.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_root_name.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_root_path.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/has_stem.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/filesystem/path/query/is_relative.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/assignment/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/assignment/assign.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/cons/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/cons/cons.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/hash/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/hash/hash.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/make_observer.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/relops/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/relops/relops.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/requirements.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/swap/
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/swap/swap.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/libstdc++-v3/testsuite/experimental/memory/observer_ptr/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/gomp-4_0-branch/
            ('svn:mergeinfo' modified)