[Boost-commit] svn:boost r63641 - in sandbox/SOC/2009/unicode/boost: . unicode

Subject: [Boost-commit] svn:boost r63641 - in sandbox/SOC/2009/unicode/boost: . unicode
From: loufoque_at_[hidden]
Date: 2010-07-04 20:59:31

Author: mgaunard
Date: 2010-07-04 20:59:30 EDT (Sun, 04 Jul 2010)
New Revision: 63641
URL: http://svn.boost.org/trac/boost/changeset/63641

Log:
fixing problems with MSVC
Text files modified: 
   sandbox/SOC/2009/unicode/boost/cuchar.hpp              |     1 +                                       
   sandbox/SOC/2009/unicode/boost/unicode/compose_fwd.hpp |     4 ++--                                    
   2 files changed, 3 insertions(+), 2 deletions(-)

Modified: sandbox/SOC/2009/unicode/boost/cuchar.hpp
==============================================================================
--- sandbox/SOC/2009/unicode/boost/cuchar.hpp	(original)
+++ sandbox/SOC/2009/unicode/boost/cuchar.hpp	2010-07-04 20:59:30 EDT (Sun, 04 Jul 2010)
@@ -1,6 +1,7 @@
 #ifndef BOOST_CUCHAR_HPP
 #define BOOST_CUCHAR_HPP
 
+#include <boost/config.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/detail/unspecified.hpp>
 

Modified: sandbox/SOC/2009/unicode/boost/unicode/compose_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/unicode/boost/unicode/compose_fwd.hpp	(original)
+++ sandbox/SOC/2009/unicode/boost/unicode/compose_fwd.hpp	2010-07-04 20:59:30 EDT (Sun, 04 Jul 2010)
@@ -217,8 +217,8 @@
         bool operator()(const ucd::unichar_compose_data_entry& lft, const ucd::unichar_compose_data_entry& rgt) const
         {
             return std::lexicographical_compare(
-                lft.decomp+1, lft.decomp+1+std::min(lft.decomp[0], rgt.decomp[0]),
-                rgt.decomp+1, rgt.decomp+1+std::min(lft.decomp[0], rgt.decomp[0])
+                lft.decomp+1, lft.decomp+1+std::min BOOST_PREVENT_MACRO_SUBSTITUTION (lft.decomp[0], rgt.decomp[0]),
+                rgt.decomp+1, rgt.decomp+1+std::min BOOST_PREVENT_MACRO_SUBSTITUTION (lft.decomp[0], rgt.decomp[0])
             );
         }