diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-04 23:35:51 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-04 23:35:51 +0000 |
| commit | e5b41f7ccf965756a2fca2e96208bb5885b48b21 (patch) | |
| tree | 7f93d063cb7b1aee5ceeb54b69cf596577b697e9 | |
| parent | a00db36b8678c6873b3ffbf9ffd64c66890695c6 (diff) | |
| download | bcm5719-llvm-e5b41f7ccf965756a2fca2e96208bb5885b48b21.tar.gz bcm5719-llvm-e5b41f7ccf965756a2fca2e96208bb5885b48b21.zip | |
Fix private inheritance in C++03 tuple_size
llvm-svn: 291032
| -rw-r--r-- | libcxx/include/__tuple | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/__tuple b/libcxx/include/__tuple index ce45db380c6..cc6a830a9ad 100644 --- a/libcxx/include/__tuple +++ b/libcxx/include/__tuple @@ -49,9 +49,9 @@ class _LIBCPP_TYPE_VIS_ONLY tuple_size<__enable_if_tuple_size_imp< : public integral_constant<size_t, tuple_size<_Tp>::value> {}; #else -template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size<const _Tp> : tuple_size<_Tp> {}; -template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size<volatile _Tp> : tuple_size<_Tp> {}; -template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size<const volatile _Tp> : tuple_size<_Tp> {}; +template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size<const _Tp> : public tuple_size<_Tp> {}; +template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size<volatile _Tp> : public tuple_size<_Tp> {}; +template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size<const volatile _Tp> : public tuple_size<_Tp> {}; #endif template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_element; |
