Branch for 2nd try at V2 removal

[SVN r77497]
Fix bug in object_cache.hpp
2025-06-26 04:11:35 +02:00 · 2012-03-23 12:04:44 +00:00 · 2012-01-29 13:33:03 +00:00 · 2012-01-05 17:31:34 +00:00 · 2012-01-05 17:27:51 +00:00 · 2012-01-05 13:33:48 +00:00
3 changed files with 19 additions and 8 deletions
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@ -48,17 +48,21 @@ if ! $(disable-icu)
   }
   else
   {
-      lib icuuc : :                                           <link>shared <runtime-link>shared <conditional>@path_options ;
-      lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuuc : :                                                               <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuuc : : <toolset>msvc                     <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
      lib icuuc : : <name>this_is_an_invalid_library_name ;

-      lib icudt : : <name>icudata               <link>shared <runtime-link>shared <conditional>@path_options ;
-      lib icudt : : <name>icudt   <toolset>msvc <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icudt : : <name>icudata                                   <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icudt : : <name>icudt   <toolset>msvc                     <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icudt : : <name>icudt   <toolset>intel <target-os>windows <link>shared <runtime-link>shared <conditional>@path_options ;
      lib icudt : : <name>this_is_an_invalid_library_name ;

-      lib icuin : :                                <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
-      lib icuin : : <toolset>msvc <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
-      lib icuin : : <toolset>msvc <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : :                                                    <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>msvc                     <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>msvc                     <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>intel <target-os>windows <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>intel <target-os>windows <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
      lib icuin : : <name>this_is_an_invalid_library_name ;

      if $(ICU_PATH)
@ -151,3 +155,4 @@ boost-install boost_regex ;



+
--- a/include/boost/regex/pending/object_cache.hpp
+++ b/include/boost/regex/pending/object_cache.hpp
@ -151,7 +151,7 @@ boost::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key& k,
            --s;
         }
         else
-            --pos;
+            ++pos;
      }
      BOOST_ASSERT(s_data.index[k]->first.get() == result.get());
      BOOST_ASSERT(&(s_data.index.find(k)->first) == s_data.cont.back().second);
--- a/include/boost/regex/v4/regex_format.hpp
+++ b/include/boost/regex/v4/regex_format.hpp
@ -180,8 +180,14 @@ private:
   }
   inline int toi(ForwardIter& i, ForwardIter j, int base)
   {
+#if defined(_MSC_VER) && defined(__INTEL_COMPILER) && ((__INTEL_COMPILER == 9999) || (__INTEL_COMPILER == 1210))
+      // Workaround for Intel support issue #656654.
+      // See also https://svn.boost.org/trac/boost/ticket/6359
+      return toi(i, j, base, mpl::false_());
+#else
      typedef typename boost::is_convertible<ForwardIter, const char_type*&>::type tag_type;
      return toi(i, j, base, tag_type());
+#endif
   }

   const traits&    m_traits;       // the traits class for localised formatting operations
Author	SHA1	Message	Date
Beman Dawes	eeacb7e12e	Branch for 2nd try at V2 removal [SVN r77497]	2012-03-23 12:04:44 +00:00
John Maddock	9ab4fb9eff	Fix bug in object_cache.hpp Fixes #6440. [SVN r76775]	2012-01-29 13:33:03 +00:00
John Maddock	ed90c8cec5	Fix pp-logic. Refs #6359. [SVN r76324]	2012-01-05 17:31:34 +00:00
John Maddock	c72bb1b175	Fix Intel-win ICU library names. [SVN r76322]	2012-01-05 17:27:51 +00:00
John Maddock	eedb7b5063	Add workaround for Intel-12.1 on Windows. Fixes #6359. [SVN r76319]	2012-01-05 13:33:48 +00:00
John Maddock	e389d92752	Add BOOST_REGEX_NO_FASTCALL config macro and regenerate docs. Fixes #6245. [SVN r76140]	2011-12-24 18:04:37 +00:00
John Maddock	c711849c8a	Fix typo and regenerate docs. Fixes #6154. [SVN r76139]	2011-12-24 17:51:57 +00:00
John Maddock	806a0ed81a	Fix typos. Refs #6003. [SVN r76138]	2011-12-24 17:31:27 +00:00
John Maddock	728ef21347	Add missing file. [SVN r75961]	2011-12-15 11:24:18 +00:00
John Maddock	56b4ff40cb	Update fixed issues in docs. [SVN r74965]	2011-10-16 12:25:52 +00:00
John Maddock	eecd107870	Added missing typename. [SVN r74900]	2011-10-10 17:51:27 +00:00
John Maddock	c485b12568	Fix case change bug. Fixes #698. [SVN r74898]	2011-10-10 16:55:27 +00:00
John Maddock	f04f7605ce	Improve sprintf usage. Stop passing UDT's through (...) even in meta programs. Fixes #5958. Refs #5835. [SVN r74897]	2011-10-10 15:46:07 +00:00
John Maddock	852bc502cf	Allow source to be built by #including all the source files in a single TU. Fixes #5736. [SVN r74896]	2011-10-10 15:09:40 +00:00
John Maddock	cc03c77deb	Fix code to use checked iterators. [SVN r74855]	2011-10-09 17:37:05 +00:00