From 6b6874c8e2de455456b822bb30ecdb4519ebed78 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Tue, 21 Mar 2017 19:12:21 +0000
Subject: [PATCH] Fix a couple of 'C++11'-isms from the last checkin, which
 broke the '03 bot.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@298422 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/type_traits                                        | 7 +++++++
 .../time.duration/time.duration.arithmetic/op_+.pass.cpp   | 4 ++--
 .../time.duration/time.duration.arithmetic/op_-.pass.cpp   | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/include/type_traits b/include/type_traits
index 8facb3bb9..feb90005f 100644
--- a/include/type_traits
+++ b/include/type_traits
@@ -1947,6 +1947,13 @@ template <class _Tp> using make_unsigned_t = typename make_unsigned<_Tp>::type;
 
 #ifdef _LIBCPP_HAS_NO_VARIADICS
 
+template <>
+struct _LIBCPP_TEMPLATE_VIS common_type<void, void, void>
+{
+public:
+    typedef void type;
+};
+
 template <class _Tp, class _Up = void, class _Vp = void>
 struct _LIBCPP_TEMPLATE_VIS common_type
 {
diff --git a/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp b/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
index 2bfe9a3b7..b85f03952 100644
--- a/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
+++ b/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
@@ -37,8 +37,8 @@ int main()
     {
     typedef std::chrono::duration<int, std::ratio<10,10> > D10;
     typedef std::chrono::duration<int, std::ratio< 1, 1> > D1;
-    D10 zero{0};
-    D10 one{1};
+    D10 zero(0);
+    D10 one(1);
     static_assert( (std::is_same< decltype(+one), decltype(zero-one) >::value), "");
     static_assert( (std::is_same< decltype(zero+one), D1>::value), "");
     static_assert( (std::is_same< decltype(+one),     D1>::value), "");
diff --git a/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp b/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
index bc1328c9d..347cc1980 100644
--- a/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
+++ b/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
@@ -37,8 +37,8 @@ int main()
     {
     typedef std::chrono::duration<int, std::ratio<10,10> > D10;
     typedef std::chrono::duration<int, std::ratio< 1, 1> > D1;
-    D10 zero{0};
-    D10 one{1};
+    D10 zero(0);
+    D10 one(1);
     static_assert( (std::is_same< decltype(-one), decltype(zero-one) >::value), "");
     static_assert( (std::is_same< decltype(zero-one), D1>::value), "");
     static_assert( (std::is_same< decltype(-one),     D1>::value), "");