summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
diff options
context:
space:
mode:
authorEric Liu <ioeric@google.com>2016-09-14 10:05:10 +0000
committerEric Liu <ioeric@google.com>2016-09-14 10:05:10 +0000
commit762b4887c23edfd0bcb02471ae573f73e5a53c4b (patch)
treee08b81dc2f8321a1085727cace7375ac8b6765fc /clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
parent9790d8f81d3d8a8a90040be70a3a897a343f6ed9 (diff)
downloadbcm5719-llvm-762b4887c23edfd0bcb02471ae573f73e5a53c4b.tar.gz
bcm5719-llvm-762b4887c23edfd0bcb02471ae573f73e5a53c4b.zip
Revert "[modules] When merging one definition into another, propagate the list of re-exporting modules from the discarded definition to the retained definition."
This reverts commit r281429. llvm-svn: 281452
Diffstat (limited to 'clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h')
-rw-r--r--clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h b/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
index 68957dbad07..db80eda1ea6 100644
--- a/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
+++ b/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
@@ -5,7 +5,5 @@ namespace CrossModuleMerge {
template<typename, typename> struct A {};
template<typename T> struct B : A<T> {};
template<typename T> inline auto C(T) {}
-
- template<typename T> inline auto D(T) {}
}
OpenPOWER on IntegriCloud