commit 0389c53f4415eedf5da1f3b3ee35494fae4d7963
author Sean Hunt <scshunt@csclub.uwaterloo.ca> Tue Jul 12 00:55:04 2011 +0000
committer Sean Hunt <scshunt@csclub.uwaterloo.ca> Tue Jul 12 00:55:04 2011 +0000
tree 0874996af5d6bbda2e3b2acfbfdc719672fc9734
parent 66f2641ac9a743bebad4997066200a8ed9f69511

Make sure that __time_put constructors properly on non-Apple platforms.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134947 91177308-0d34-0410-b5e6-96231b3b80d8

include/locale

diff --git a/include/locale b/include/locale
index 778d6c6..f1ef8c3 100644
--- a/include/locale
+++ b/include/locale
@@ -2516,7 +2516,11 @@
 {
     locale_t __loc_;
 protected:
+#ifdef _LIBCPP_STABLE_APPLE_ABI
     _LIBCPP_ALWAYS_INLINE __time_put() : __loc_(0) {}
+#else   // _LIBCPP_STABLE_APPLE_ABI
+    _LIBCPP_ALWAYS_INLINE __time_put() : __loc_(__cloc()) {}
+#endif  // _LIBCPP_STABLE_APPLE_ABI
     __time_put(const char* __nm);
     __time_put(const string& __nm);
     ~__time_put();