ooo-build r11723 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Wed Feb 27 16:16:43 2008
New Revision: 11723
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11723&view=rev

Log:
2008-02-27  Tor Lillqvist  <tml novell com>

	* patches/src680/boost-patch.diff: Add patch to
	boost/spirit/iterator/position_iterator.hpp to fix a problem with
	MSVC 7.1 that was noticed when compiling the new SVG import bits.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/boost-patch.diff

Modified: trunk/patches/src680/boost-patch.diff
==============================================================================
--- trunk/patches/src680/boost-patch.diff	(original)
+++ trunk/patches/src680/boost-patch.diff	Wed Feb 27 16:16:43 2008
@@ -1,6 +1,6 @@
 --- boost/boost-1.30.2.patch.OLD	2005-10-11 11:58:51.000000000 +0300
 +++ boost/boost-1.30.2.patch	2006-02-16 17:23:14.000000000 +0200
-@@ -710,3 +710,350 @@
+@@ -710,3 +710,371 @@
                    return tok_;
                }   
                template <class Iterator>
@@ -351,3 +351,24 @@
 +              iterator2 end () const {
 +                  return iterator2 ((*this) (), it1_, it2_ ().end ());
 +              }
++--- misc/build/boost-1.30.2/boost/spirit/iterator/position_iterator.hpp
+++++ misc/build/boost-1.30.2/boost/spirit/iterator/position_iterator.hpp
++@@ -25,10 +25,18 @@
++ #endif
++ 
++ #if defined(BOOST_NO_STD_ITERATOR_TRAITS)
+++#ifdef BOOST_MSVC
+++#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
++ #define BOOST_SPIRIT_IT_NS impl
++ #else
++ #define BOOST_SPIRIT_IT_NS std
++ #endif
+++#else
+++#define BOOST_SPIRIT_IT_NS impl
+++#endif
+++#else
+++#define BOOST_SPIRIT_IT_NS std
+++#endif
++ 
++ ///////////////////////////////////////////////////////////////////////////////
++ namespace boost { namespace spirit {