diff options
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiate.cpp | 3 | ||||
| -rw-r--r-- | test/SemaTemplate/instantiate-expr-2.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp index a943d4e2a0..59b795d0f5 100644 --- a/lib/Sema/SemaTemplateInstantiate.cpp +++ b/lib/Sema/SemaTemplateInstantiate.cpp @@ -846,9 +846,6 @@ TemplateExprInstantiator::VisitConditionalOperator(ConditionalOperator *E) { if (Result.isInvalid()) return SemaRef.ExprError(); -/* Cond.release(); - True.release(); - False.release();*/ return move(Result); } diff --git a/test/SemaTemplate/instantiate-expr-2.cpp b/test/SemaTemplate/instantiate-expr-2.cpp index 82cd757e68..7cfaa9c8ee 100644 --- a/test/SemaTemplate/instantiate-expr-2.cpp +++ b/test/SemaTemplate/instantiate-expr-2.cpp @@ -95,7 +95,11 @@ namespace N6 { }; typedef Cond<true, int, char>::True True; - typedef Cond<false, int, char>::False False; + typedef Cond<true, int, char>::False False; + + // check that we have the right types + Lookup<1> const &L1(False()); + Lookup<sizeof(int)> const &L2(True()); } |