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

Subject: [Boost-commit] svn:boost r58342 - trunk/boost/regex/v4
From: john_at_[hidden]
Date: 2009-12-13 06:40:29

Author: johnmaddock
Date: 2009-12-13 06:40:28 EST (Sun, 13 Dec 2009)
New Revision: 58342
URL: http://svn.boost.org/trac/boost/changeset/58342

Log:
Symbian patches.
Fixes #3764.
Fixes #3763.
Text files modified: 
   trunk/boost/regex/v4/basic_regex_parser.hpp    |     6 +++---                                  
   trunk/boost/regex/v4/perl_matcher.hpp          |     2 +-                                      
   trunk/boost/regex/v4/regex_traits_defaults.hpp |     2 +-                                      
   3 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/regex/v4/basic_regex_parser.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex_parser.hpp	(original)
+++ trunk/boost/regex/v4/basic_regex_parser.hpp	2009-12-13 06:40:28 EST (Sun, 13 Dec 2009)
@@ -195,8 +195,8 @@
    // Augment error message with the regular expression text:
    //
    if(start_pos == position)
-      start_pos = (std::max)(static_cast<std::ptrdiff_t>(0), position - 10);
-   std::ptrdiff_t end_pos = (std::min)(position + 10, m_end - m_base);
+      start_pos = (std::max)(static_cast<std::ptrdiff_t>(0), position - static_cast<std::ptrdiff_t>(10));
+   std::ptrdiff_t end_pos = (std::min)(position + static_cast<std::ptrdiff_t>(10), static_cast<std::ptrdiff_t>(m_end - m_base));
    if(error_code != regex_constants::error_empty)
    {
       if((start_pos != 0) || (end_pos != (m_end - m_base)))
@@ -1683,7 +1683,7 @@
       }
       else
       {
-         std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), m_end - m_position);
+         std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), static_cast<std::ptrdiff_t>(m_end - m_position));
          int i = this->m_traits.toi(m_position, m_position + len, 16);
          if((i < 0)
             || !valid_value(charT(0), i))

Modified: trunk/boost/regex/v4/perl_matcher.hpp
==============================================================================
--- trunk/boost/regex/v4/perl_matcher.hpp	(original)
+++ trunk/boost/regex/v4/perl_matcher.hpp	2009-12-13 06:40:28 EST (Sun, 13 Dec 2009)
@@ -61,7 +61,7 @@
 {
    return ((c >= (1 << CHAR_BIT)) ? true : map[c] & mask);
 }
-#if !defined(__hpux) // WCHAR_MIN not usable in pp-directives.
+#if !defined(__hpux) && !defined(__WINSCW__)// WCHAR_MIN not usable in pp-directives.
 #if defined(WCHAR_MIN) && (WCHAR_MIN == 0) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
 inline bool can_start(wchar_t c, const unsigned char* map, unsigned char mask)
 {

Modified: trunk/boost/regex/v4/regex_traits_defaults.hpp
==============================================================================
--- trunk/boost/regex/v4/regex_traits_defaults.hpp	(original)
+++ trunk/boost/regex/v4/regex_traits_defaults.hpp	2009-12-13 06:40:28 EST (Sun, 13 Dec 2009)
@@ -84,7 +84,7 @@
 {
    return false;
 }
-#ifndef __hpux // can't use WCHAR_MAX/MIN in pp-directives
+#if !defined(__hpux) && !defined(__WINSCW__) // can't use WCHAR_MAX/MIN in pp-directives
 #ifdef _MSC_VER 
 template<>
 inline bool is_combining<wchar_t>(wchar_t c)