From 16694b5df5e0dedc66fc65d3cdf3d1afb6098ee3 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Wed, 12 Dec 2012 21:14:28 +0000
Subject: Zhang Xiongpang:  Add definitions for const data members.  Fixes
 http://llvm.org/bugs/show_bug.cgi?id=14585.

llvm-svn: 170026
---
 libcxx/src/chrono.cpp |  4 ++++
 libcxx/src/locale.cpp | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

(limited to 'libcxx/src')

diff --git a/libcxx/src/chrono.cpp b/libcxx/src/chrono.cpp
index 73c83ee084e..1ce2e2807a3 100644
--- a/libcxx/src/chrono.cpp
+++ b/libcxx/src/chrono.cpp
@@ -24,6 +24,8 @@ namespace chrono
 
 // system_clock
 
+const bool system_clock::is_steady;
+
 system_clock::time_point
 system_clock::now() _NOEXCEPT
 {
@@ -46,6 +48,8 @@ system_clock::from_time_t(time_t t) _NOEXCEPT
 
 // steady_clock
 
+const bool steady_clock::is_steady;
+
 #if __APPLE__
 //   mach_absolute_time() * MachInfo.numer / MachInfo.denom is the number of
 //   nanoseconds since the computer booted up.  MachInfo.numer and MachInfo.denom
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index 542c0d7a20f..284bee7a060 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/src/locale.cpp
@@ -83,6 +83,15 @@ make(A0 a0, A1 a1, A2 a2)
 
 }
 
+const locale::category locale::none;
+const locale::category locale::collate;
+const locale::category locale::ctype;
+const locale::category locale::monetary;
+const locale::category locale::numeric;
+const locale::category locale::time;
+const locale::category locale::messages;
+const locale::category locale::all;
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wpadded"
 
@@ -691,6 +700,19 @@ collate_byname<wchar_t>::do_transform(const char_type* lo, const char_type* hi)
 
 // template <> class ctype<wchar_t>;
 
+const ctype_base::mask ctype_base::space;
+const ctype_base::mask ctype_base::print;
+const ctype_base::mask ctype_base::cntrl;
+const ctype_base::mask ctype_base::upper;
+const ctype_base::mask ctype_base::lower;
+const ctype_base::mask ctype_base::alpha;
+const ctype_base::mask ctype_base::digit;
+const ctype_base::mask ctype_base::punct;
+const ctype_base::mask ctype_base::xdigit;
+const ctype_base::mask ctype_base::blank;
+const ctype_base::mask ctype_base::alnum;
+const ctype_base::mask ctype_base::graph;
+    
 locale::id ctype<wchar_t>::id;
 
 ctype<wchar_t>::~ctype()
-- 
cgit v1.2.3