summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2018-01-02 19:01:45 +0000
committerMarshall Clow <mclow.lists@gmail.com>2018-01-02 19:01:45 +0000
commit4e498577b5d83c8d16da14d00f2ee54bd88d422f (patch)
treeee9674c7afe8173b2aaa7d303de4c9157e8ccb58
parent136dc563ad98589beeb18e23963e93091e2babf1 (diff)
Un-inline a few more variables that are exported from the dylib.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@321664 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/__functional_base2
-rw-r--r--include/functional20
2 files changed, 11 insertions, 11 deletions
diff --git a/include/__functional_base b/include/__functional_base
index abf3ff54f..12af4dc96 100644
--- a/include/__functional_base
+++ b/include/__functional_base
@@ -564,7 +564,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_arg_t { };
#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_MEMORY)
extern const allocator_arg_t allocator_arg;
#else
-_LIBCPP_INLINE_VAR constexpr allocator_arg_t allocator_arg = allocator_arg_t();
+/* _LIBCPP_INLINE_VAR */ constexpr allocator_arg_t allocator_arg = allocator_arg_t();
#endif
// uses_allocator
diff --git a/include/functional b/include/functional
index c2f5a18fd..3e5215b13 100644
--- a/include/functional
+++ b/include/functional
@@ -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
-_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{};
+/* _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