diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-07-11 00:20:06 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-07-11 00:20:06 +0000 |
| commit | dc5523d38fc12d167d83b8d4732a78fbf9be70b4 (patch) | |
| tree | e45ad19f76dc62e7ea3db850a6d8e01c10d0d6d0 /clang/test/Modules/Inputs/cxx-templates-common.h | |
| parent | 7660d653c8173f9586a2e8a5a4f9e2516de7ca7c (diff) | |
| download | bcm5719-llvm-dc5523d38fc12d167d83b8d4732a78fbf9be70b4.tar.gz bcm5719-llvm-dc5523d38fc12d167d83b8d4732a78fbf9be70b4.zip | |
[modules] Don't try to merge template specializations by performing name lookup
into their container; we won't find them there. These things are already being
merged when they're added to their primary template's folding set, so this
merging is redundant (and causes us to reject-valid because we think we've
found an odr violation).
llvm-svn: 212788
Diffstat (limited to 'clang/test/Modules/Inputs/cxx-templates-common.h')
| -rw-r--r-- | clang/test/Modules/Inputs/cxx-templates-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/Modules/Inputs/cxx-templates-common.h b/clang/test/Modules/Inputs/cxx-templates-common.h index 986c52b362c..682ef939cec 100644 --- a/clang/test/Modules/Inputs/cxx-templates-common.h +++ b/clang/test/Modules/Inputs/cxx-templates-common.h @@ -26,8 +26,8 @@ template<typename T> struct TemplateInstantiationVisibility { typedef int type; template<typename T> struct Outer { template<typename U> struct Inner { - void f(); - void g(); + static constexpr int f(); + static constexpr int g(); }; }; |
