summaryrefslogtreecommitdiffstats
path: root/clang/test
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2015-05-19 00:49:29 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2015-05-19 00:49:29 +0000
commit82e57fb1e8dad604f264994e6e9ac3c03d322b22 (patch)
tree73fd41b3c46689b5db6b2bd588df572b50837dca /clang/test
parentf3fa99c48e2a69b2df4a06249b987919b744acd9 (diff)
downloadbcm5719-llvm-82e57fb1e8dad604f264994e6e9ac3c03d322b22.tar.gz
bcm5719-llvm-82e57fb1e8dad604f264994e6e9ac3c03d322b22.zip
[modules] Support for merging a parsed definition of a static data member of a class template into an imported but hidden definition.
llvm-svn: 237647
Diffstat (limited to 'clang/test')
-rw-r--r--clang/test/Modules/Inputs/submodules-merge-defs/defs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/submodules-merge-defs/defs.h b/clang/test/Modules/Inputs/submodules-merge-defs/defs.h
index ffd996af184..f864d5762d2 100644
--- a/clang/test/Modules/Inputs/submodules-merge-defs/defs.h
+++ b/clang/test/Modules/Inputs/submodules-merge-defs/defs.h
@@ -26,9 +26,11 @@ template<typename T> int E(T t) { return t; }
template<typename T> struct F {
int f();
template<typename U> int g();
+ static int n;
};
template<typename T> int F<T>::f() { return 0; }
template<typename T> template<typename U> int F<T>::g() { return 0; }
+template<typename T> int F<T>::n = 0;
template<> template<typename U> int F<char>::g() { return 0; }
template<> struct F<void> { int h(); };
inline int F<void>::h() { return 0; }
OpenPOWER on IntegriCloud