1 From 1c99272d860d0d753803c156d60d20a07ec27255 Mon Sep 17 00:00:00 2001 2 From: David 'Digit' Turner <digit (a] google.com> 3 Date: Thu, 2 May 2013 14:11:11 +0200 4 Subject: include/regex: Support building with GCC 4.6 5 6 --- 7 include/regex | 6 +++++- 8 1 file changed, 5 insertions(+), 1 deletion(-) 9 10 diff --git a/include/regex b/include/regex 11 index 19e08b1..2417dc9 100644 12 --- a/include/regex 13 +++ b/include/regex 14 @@ -933,7 +933,7 @@ public: 15 typedef locale locale_type; 16 typedef ctype_base::mask char_class_type; 17 18 - static const char_class_type __regex_word = 0x80; 19 + static const char_class_type __regex_word; 20 private: 21 locale __loc_; 22 const ctype<char_type>* __ct_; 23 @@ -1008,9 +1008,13 @@ private: 24 int __value(wchar_t __ch, int __radix) const; 25 }; 26 27 +template <class _CharT> const typename regex_traits<_CharT>::char_class_type regex_traits<_CharT>::__regex_word = 0x80; 28 + 29 +#if 0 30 template <class _CharT> 31 const typename regex_traits<_CharT>::char_class_type 32 regex_traits<_CharT>::__regex_word; 33 +#endif 34 35 template <class _CharT> 36 regex_traits<_CharT>::regex_traits() 37 -- 38 1.7.12.146.g16d26b1 39 40
