From a2f9036b7e46166361b612c7fc66544d5529dc67 Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@gmail.com>
Date: Wed, 28 Aug 2013 05:45:53 +0000
Subject: [PATCH] Richard makes a good point, clean up this test.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189444 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/SemaTemplate/temp_arg_template.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/test/SemaTemplate/temp_arg_template.cpp b/test/SemaTemplate/temp_arg_template.cpp
index 2053b7978d..dec5dd37d4 100644
--- a/test/SemaTemplate/temp_arg_template.cpp
+++ b/test/SemaTemplate/temp_arg_template.cpp
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
 
 template<template<typename T> class X> struct A; // expected-note 2{{previous template template parameter is here}}
 
@@ -32,9 +31,7 @@ template<typename T> void f(int);
 A<f> *a9; // expected-error{{must be a class template}}
 
 // Evil digraph '<:' is parsed as '[', expect error.
-#if __cplusplus < 201103
 A<::N::Z> *a10; // expected-error{{found '<::' after a template name which forms the digraph '<:' (aka '[') and a ':', did you mean '< ::'?}}
-#endif
 
 // Do not do a digraph correction here.
 A<: :N::Z> *a11;  // expected-error{{expected expression}} \
@@ -59,20 +56,18 @@ namespace N {
 }
 
 // PR12179
-#if __cplusplus < 201103
 template <typename Primitive, template <Primitive...> class F> // expected-warning {{variadic templates are a C++11 extension}}
 struct unbox_args {
   typedef typename Primitive::template call<F> x;
 };
-#else
-template <template <typename> class... Templates>
+
+template <template <typename> class... Templates> // expected-warning {{variadic templates are a C++11 extension}}
 struct template_tuple {};
 template <typename T>
 struct identity {};
-template <template <typename> class... Templates>
+template <template <typename> class... Templates> // expected-warning {{variadic templates are a C++11 extension}}
 template_tuple<Templates...> f7() {}
 
 void foo() {
   f7<identity>();
 }
-#endif
-- 
2.40.0