From 3e33d11b06daadb73f3a8fdc47f04a4e1f326b12 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Fri, 9 Jan 2015 17:03:36 +0000
Subject: [PATCH] K-Ballo found a place where we were using 'V' as a template
 parameter. Replace with '_Vp' for protection against user-defined macros.

llvm-svn: 225527
---
 libcxx/include/type_traits | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits
index f4677358a560..914e8593b2fe 100644
--- a/libcxx/include/type_traits
+++ b/libcxx/include/type_traits
@@ -1433,11 +1433,11 @@ template <class _Tp> using make_unsigned_t = typename make_unsigned<_Tp>::type;
 
 #ifdef _LIBCPP_HAS_NO_VARIADICS
 
-template <class _Tp, class _Up = void, class V = void>
+template <class _Tp, class _Up = void, class _Vp = void>
 struct _LIBCPP_TYPE_VIS_ONLY common_type
 {
 public:
-    typedef typename common_type<typename common_type<_Tp, _Up>::type, V>::type type;
+    typedef typename common_type<typename common_type<_Tp, _Up>::type, _Vp>::type type;
 };
 
 template <class _Tp>