Author: marshall
Date: Tue Mar 21 14:12:21 2017
New Revision: 298422
URL: http://llvm.org/viewvc/llvm-project?rev=298422&view=rev
Log:
Fix a couple of 'C++11'-isms from the last checkin, which broke the '03 bot.
Modified:
libcxx/trunk/include/type_traits
libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
Modified: libcxx/trunk/include/type_traits
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/type_traits?rev=298422&r1=298421&r2=298422&view=diff
==============================================================================
--- libcxx/trunk/include/type_traits (original)
+++ libcxx/trunk/include/type_traits Tue Mar 21 14:12:21 2017
@@ -1947,6 +1947,13 @@ template <class _Tp> using make_unsigned
#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
{
Modified:
libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_%2B.pass.cpp?rev=298422&r1=298421&r2=298422&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
Tue Mar 21 14:12:21 2017
@@ -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), "");
Modified:
libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp?rev=298422&r1=298421&r2=298422&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
Tue Mar 21 14:12:21 2017
@@ -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), "");
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
