diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2018-01-06 21:36:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2018-01-06 21:36:34 +0000 |
| commit | bbb901fa67d0cd47565bb9972beb367ae264ec69 (patch) | |
| tree | 59d57aeb80de00e0471fbd0bce10f29776675db6 /include/functional | |
| parent | 0294ba5648d889e48ffee8ddad25944e258940ae (diff) | |
Notes
Diffstat (limited to 'include/functional')
| -rw-r--r-- | include/functional | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/functional b/include/functional index f73c3ca56a8e..3e5215b137b5 100644 --- a/include/functional +++ b/include/functional @@ -213,9 +213,9 @@ template<class T> struct is_bind_expression; template<class T> struct is_placeholder; // See C++14 20.9.9, Function object binders -template <class T> constexpr bool is_bind_expression_v +template <class T> inline constexpr bool is_bind_expression_v = is_bind_expression<T>::value; // C++17 -template <class T> constexpr int is_placeholder_v +template <class T> inline constexpr int is_placeholder_v = is_placeholder<T>::value; // C++17 @@ -1991,7 +1991,7 @@ template<class _Tp> struct _LIBCPP_TEMPLATE_VIS is_bind_expression #if _LIBCPP_STD_VER > 14 template <class _Tp> -constexpr size_t is_bind_expression_v = is_bind_expression<_Tp>::value; +_LIBCPP_INLINE_VAR constexpr size_t is_bind_expression_v = is_bind_expression<_Tp>::value; #endif template<class _Tp> struct __is_placeholder : public integral_constant<int, 0> {}; @@ -2000,7 +2000,7 @@ template<class _Tp> struct _LIBCPP_TEMPLATE_VIS is_placeholder #if _LIBCPP_STD_VER > 14 template <class _Tp> -constexpr size_t is_placeholder_v = is_placeholder<_Tp>::value; +_LIBCPP_INLINE_VAR constexpr size_t is_placeholder_v = is_placeholder<_Tp>::value; #endif namespace placeholders @@ -2020,16 +2020,16 @@ _LIBCPP_FUNC_VIS extern const __ph<8> _8; _LIBCPP_FUNC_VIS extern const __ph<9> _9; _LIBCPP_FUNC_VIS extern const __ph<10> _10; #else -constexpr __ph<1> _1{}; -constexpr __ph<2> _2{}; -constexpr __ph<3> _3{}; -constexpr __ph<4> _4{}; -constexpr __ph<5> _5{}; -constexpr __ph<6> _6{}; -constexpr __ph<7> _7{}; -constexpr __ph<8> _8{}; -constexpr __ph<9> _9{}; -constexpr __ph<10> _10{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<1> _1{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<2> _2{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<3> _3{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<4> _4{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<5> _5{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<6> _6{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<7> _7{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<8> _8{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<9> _9{}; +/* _LIBCPP_INLINE_VAR */ constexpr __ph<10> _10{}; #endif // defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_BIND) } // placeholders |