summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2014-07-16 01:00:26 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2014-07-16 01:00:26 +0000
commitf4a391c07fffba4631bd2b1b01d85120da125ee0 (patch)
tree1222efcc08ca2737dc9f823405d9d8b9ce1745b2 /libcxx
parent7433281b5e4f907d0ade86a8e0a1a42591cd61ff (diff)
downloadbcm5719-llvm-f4a391c07fffba4631bd2b1b01d85120da125ee0.tar.gz
bcm5719-llvm-f4a391c07fffba4631bd2b1b01d85120da125ee0.zip
Change Windows decoration on some base classes
Mark the base classes for time_get_byname and time_get as _LIBCPP_TYPE_VIS_ONLY rather than _LIBCPP_TYPE_VIS. These base classes are templated types and cannot be stored with export dll storage. Fixes compilation with _LIBCPP_DLL for Windows when the time_get and time_get_byname classes are used. llvm-svn: 213116
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/include/locale4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/locale b/libcxx/include/locale
index 8e01630e0bd..fcff402bb1a 100644
--- a/libcxx/include/locale
+++ b/libcxx/include/locale
@@ -1871,7 +1871,7 @@ public:
};
template <class _CharT>
-class _LIBCPP_TYPE_VIS __time_get_c_storage
+class _LIBCPP_TYPE_VIS_ONLY __time_get_c_storage
{
protected:
typedef basic_string<_CharT> string_type;
@@ -2509,7 +2509,7 @@ protected:
};
template <class _CharT>
-class _LIBCPP_TYPE_VIS __time_get_storage
+class _LIBCPP_TYPE_VIS_ONLY __time_get_storage
: public __time_get
{
protected:
OpenPOWER on IntegriCloud