[Boost-commit] svn:boost r86065 - trunk/boost/regex/v4

Subject: [Boost-commit] svn:boost r86065 - trunk/boost/regex/v4
From: steveire_at_[hidden]
Date: 2013-09-30 11:57:49

Author: skelly
Date: 2013-09-30 11:57:49 EDT (Mon, 30 Sep 2013)
New Revision: 86065
URL: http://svn.boost.org/trac/boost/changeset/86065

Log:
Regex: Remove obsolete GCC version checks.

Text files modified: 
   trunk/boost/regex/v4/basic_regex_creator.hpp |    17 -----------------                       
   trunk/boost/regex/v4/perl_matcher_common.hpp |     4 ----                                    
   2 files changed, 0 insertions(+), 21 deletions(-)

Modified: trunk/boost/regex/v4/basic_regex_creator.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex_creator.hpp	Mon Sep 30 11:57:33 2013	(r86064)
+++ trunk/boost/regex/v4/basic_regex_creator.hpp	2013-09-30 11:57:49 EDT (Mon, 30 Sep 2013)	(r86065)
@@ -431,20 +431,10 @@
       if(flags() & regex_constants::collate)
       {
          // we need to transform our range into sort keys:
-#if BOOST_WORKAROUND(__GNUC__, < 3)
-         string_type in(3, charT(0));
-         in[0] = c1.first;
-         in[1] = c1.second;
-         s1 = this->m_traits.transform(in.c_str(), (in[1] ? in.c_str()+2 : in.c_str()+1));
-         in[0] = c2.first;
-         in[1] = c2.second;
-         s2 = this->m_traits.transform(in.c_str(), (in[1] ? in.c_str()+2 : in.c_str()+1));
-#else
          charT a1[3] = { c1.first, c1.second, charT(0), };
          charT a2[3] = { c2.first, c2.second, charT(0), };
          s1 = this->m_traits.transform(a1, (a1[1] ? a1+2 : a1+1));
          s2 = this->m_traits.transform(a2, (a2[1] ? a2+2 : a2+1));
-#endif
          if(s1.size() == 0)
             s1 = string_type(1, charT(0));
          if(s2.size() == 0)
@@ -489,15 +479,8 @@
       string_type s;
       if(first->second)
       {
-#if BOOST_WORKAROUND(__GNUC__, < 3)
-         string_type in(3, charT(0));
-         in[0] = first->first;
-         in[1] = first->second;
-         s = m_traits.transform_primary(in.c_str(), in.c_str()+2);
-#else
          charT cs[3] = { first->first, first->second, charT(0), };
          s = m_traits.transform_primary(cs, cs+2);
-#endif
       }
       else
          s = m_traits.transform_primary(&first->first, &first->first+1);

Modified: trunk/boost/regex/v4/perl_matcher_common.hpp
==============================================================================
--- trunk/boost/regex/v4/perl_matcher_common.hpp	Mon Sep 30 11:57:33 2013	(r86064)
+++ trunk/boost/regex/v4/perl_matcher_common.hpp	2013-09-30 11:57:49 EDT (Mon, 30 Sep 2013)	(r86065)
@@ -458,11 +458,7 @@
    if(position != last)
    {
       // prev and this character must be opposites:
-   #if defined(BOOST_REGEX_USE_C_LOCALE) && defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 95)
-      b = traits::isctype(*position, m_word_mask);
-   #else
       b = traits_inst.isctype(*position, m_word_mask);
-   #endif
    }
    else
    {