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

Subject: [Boost-commit] svn:boost r59275 - trunk/boost/regex/v4
From: john_at_[hidden]
Date: 2010-01-27 08:17:52

Author: johnmaddock
Date: 2010-01-27 08:17:51 EST (Wed, 27 Jan 2010)
New Revision: 59275
URL: http://svn.boost.org/trac/boost/changeset/59275

Log:
Suppress a few warnings.
Text files modified: 
   trunk/boost/regex/v4/basic_regex_creator.hpp |     2 +-                                      
   trunk/boost/regex/v4/match_results.hpp       |     2 +-                                      
   trunk/boost/regex/v4/regex_format.hpp        |     6 +++---                                  
   3 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/regex/v4/basic_regex_creator.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex_creator.hpp	(original)
+++ trunk/boost/regex/v4/basic_regex_creator.hpp	2010-01-27 08:17:51 EST (Wed, 27 Jan 2010)
@@ -804,7 +804,7 @@
          {
             bool ok = false;
             re_syntax_base* p = base;
-            int id = static_cast<re_jump*>(state)->alt.i;
+            std::ptrdiff_t id = static_cast<re_jump*>(state)->alt.i;
             if(id > 10000)
                id = m_pdata->get_id(id);
             while(p)

Modified: trunk/boost/regex/v4/match_results.hpp
==============================================================================
--- trunk/boost/regex/v4/match_results.hpp	(original)
+++ trunk/boost/regex/v4/match_results.hpp	2010-01-27 08:17:51 EST (Wed, 27 Jan 2010)
@@ -457,7 +457,7 @@
    void BOOST_REGEX_CALL set_second(BidiIterator i, size_type pos, bool m = true, bool escape_k = false)
    {
       if(pos)
-         m_last_closed_paren = pos;
+         m_last_closed_paren = static_cast<int>(pos);
       pos += 2;
       BOOST_ASSERT(m_subs.size() > pos);
       m_subs[pos].second = i;

Modified: trunk/boost/regex/v4/regex_format.hpp
==============================================================================
--- trunk/boost/regex/v4/regex_format.hpp	(original)
+++ trunk/boost/regex/v4/regex_format.hpp	2010-01-27 08:17:51 EST (Wed, 27 Jan 2010)
@@ -334,7 +334,7 @@
             m_position = --base;
          }
       }
-      put((this->m_results)[this->m_results.size() > 1 ? this->m_results.size() - 1 : 1]);
+      put((this->m_results)[this->m_results.size() > 1 ? static_cast<int>(this->m_results.size() - 1) : 1]);
       break;
    case '{':
       have_brace = true;
@@ -384,7 +384,7 @@
    if(have_brace && (*m_position == '^'))
       ++m_position;
 
-   int max_len = m_end - m_position;
+   std::ptrdiff_t max_len = m_end - m_position;
 
    if((max_len >= 5) && std::equal(m_position, m_position + 5, MATCH))
    {
@@ -447,7 +447,7 @@
             return false;
          }
       }
-      put((this->m_results)[this->m_results.size() > 1 ? this->m_results.size() - 1 : 1]);
+      put((this->m_results)[this->m_results.size() > 1 ? static_cast<int>(this->m_results.size() - 1) : 1]);
       return true;
    }
    if((max_len >= 20) && std::equal(m_position, m_position + 20, LAST_SUBMATCH_RESULT))