summaryrefslogtreecommitdiff
path: root/boost/boost_1_39_0.patch
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-09-17 10:11:42 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-09-17 10:11:42 +0000
commit48f8d30dfa1ba1d5a902db7d401aa3c77d780ff7 (patch)
treedbc8315867f792adb6d682072ec697cccf9777a2 /boost/boost_1_39_0.patch
parentc5c13c0be9673f12ba3c1a50610afbbb32dab94a (diff)
CWS-TOOLING: integrate CWS boost134
2009-09-09 10:30:24 +0200 fs r275970 : #i100127# provided by rene: check whether system-boost's function.hpp compiles without exception support 2009-09-04 21:58:00 +0200 fs r275832 : indention 2009-09-04 21:57:10 +0200 fs r275831 : #i10000# type in boost/spirit check. Thanks to thb 2009-09-04 10:58:54 +0200 fs r275787 : #i100127# provided by tono@openoffice.org: mingw needs using directives for std::min/max 2009-09-04 10:31:54 +0200 fs r275782 : #i100127# (approved by hjs) on Solaris, set GNUTAR to /usr/sfw/bin/gtar, this is available on baseline machines (Solaris 10.x), but not necessarily available in LD_LIBRARY_PATH 2009-08-19 21:47:55 +0200 rene r275161 : #i10000# check for the header actually used now 2009-08-17 21:55:31 +0200 fs r275073 : CWS-TOOLING: rebase CWS boost134 to trunk@275001 (milestone: DEV300:m55) 2009-07-16 09:39:25 +0200 fs r274031 : #i100127# extract download/% with GNUTAR instead of TAR 2009-07-14 09:18:15 +0200 fs r273960 : CWS-TOOLING: rebase CWS boost134 to trunk@273858 (milestone: DEV300:m52) 2009-07-13 09:55:14 +0200 fs r273919 : #i100127# use boost 1.39, not 1.34 2009-07-13 09:45:57 +0200 fs r273918 : use GNUTAR when extracting download/%.tar.gz, not TAR (necessary with boost 1.39 tarball) 2009-07-10 21:10:52 +0200 fs r273905 : #i100127# spirit now part of boost 2009-07-06 12:12:13 +0200 fs r273732 : #i10000# lngconvex, used in src/wizards, is built in shell => added missing module dependency 2009-07-02 15:34:51 +0200 fs r273660 : #i100127# 2009-07-02 13:35:24 +0200 fs r273645 : #i100127# MSVC needs some hinting when using boost::bind on (some) member functions 2009-07-02 10:33:59 +0200 fs r273625 : removed unused include (lead to an internal compiler error with MSVC and boost 1.34+) 2009-07-02 09:44:35 +0200 fs r273619 : change some include orders, prevents 'internal compiler errors' with MSVC 2009-07-01 09:19:25 +0200 fs r273547 : #i100127# who the heck is defining max as something unusable? 2009-07-01 09:17:28 +0200 fs r273546 : #i100127# defining min/max is causing trouble now 2009-07-01 09:15:40 +0200 fs r273545 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL, and disabling warning 4180 2009-07-01 09:14:23 +0200 fs r273544 : #i100127# re-disable warning 4180, still needed for some files 2009-07-01 09:07:33 +0200 fs r273543 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL 2009-06-24 11:00:32 +0200 fs r273319 : oops, re-introduced some inc locations 2009-06-23 22:10:02 +0200 fs r273304 : #i100127# disable warning C4180 2009-06-23 22:08:36 +0200 fs r273303 : #i100127# disable warning C4180 2009-06-16 12:26:49 +0200 fs r273015 : #i10000# (provided by mst@openoffice.org) 2009-06-15 09:10:27 +0200 fs r272962 : #i10000# use -r instead of -a when copying the include files, this prevents the spurious 'failed to preserve ownership' errors 2009-06-11 23:55:06 +0200 fs r272902 : #i100127# 2009-06-11 23:54:47 +0200 fs r272901 : #i100127# 2009-06-11 23:54:05 +0200 fs r272900 : make compile on unxsol[i|s]4 2009-06-10 10:12:22 +0200 fs r272798 : #i100127# don't deliver from within unxlngi6/misc/build/boost, but from a 'normalized' location unxlngi6/inc 2009-06-10 09:48:00 +0200 fs r272795 : #i100127# use 1.34.1 unconditionally on all platforms
Diffstat (limited to 'boost/boost_1_39_0.patch')
-rw-r--r--boost/boost_1_39_0.patch183
1 files changed, 183 insertions, 0 deletions
diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch
new file mode 100644
index 000000000000..d2ad9fc7db9f
--- /dev/null
+++ b/boost/boost_1_39_0.patch
@@ -0,0 +1,183 @@
+--- misc/boost_1_39_0/boost/function/function_template.hpp 2008-10-16 15:21:50.000000000 +0200
++++ misc/build/boost_1_39_0/boost/function/function_template.hpp 2009-07-09 12:58:51.141224220 +0200
+@@ -950,10 +950,10 @@
+ f.vtable->manager(f.functor, this->functor,
+ boost::detail::function::move_functor_tag);
+ f.vtable = 0;
+-#if !defined(BOOST_NO_EXCEPTIONS)
+ } else {
+ clear();
+ }
++#if !defined(BOOST_NO_EXCEPTIONS)
+ } catch (...) {
+ vtable = 0;
+ throw;
+--- misc/boost_1_39_0/boost/function/function_base.hpp 2008-10-16 15:21:50.000000000 +0200
++++ misc/build/boost_1_39_0/boost/function/function_base.hpp 2009-07-12 21:42:22.779873909 +0200
+@@ -42,7 +42,7 @@
+ #endif
+
+ // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
+-#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
++#ifdef BOOST_NO_STD_TYPEINFO
+ // Embedded VC++ does not have type_info in namespace std
+ # define BOOST_FUNCTION_STD_NS
+ #else
+--- misc/boost_1_39_0/boost/config/compiler/visualc.hpp 2009-03-26 20:00:00.000000000 +0100
++++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp 2009-06-10 21:53:42.484375000 +0200
+@@ -138,6 +138,9 @@
+ # define BOOST_NO_RTTI
+ #endif
+
++// disable WORKAROUND macro - gives warning for undefined macros
++#define BOOST_STRICT_CONFIG 1
++
+ //
+ // all versions support __declspec:
+ //
+--- misc/boost_1_39_0/boost/mpl/apply_wrap.hpp 2008-10-11 08:50:46.000000000 +0200
++++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp 2009-06-10 21:53:42.500000000 +0200
+@@ -173,8 +173,8 @@
+ # undef i_
+
+ ///// iteration, depth == 2
+-
+-#elif BOOST_PP_ITERATION_DEPTH() == 2
++#else
++#if BOOST_PP_ITERATION_DEPTH() == 2
+
+ # define j_ BOOST_PP_FRAME_ITERATION(2)
+
+@@ -230,4 +231,5 @@
+ # undef j_
+
+ #endif // BOOST_PP_ITERATION_DEPTH()
++#endif
+ #endif // BOOST_PP_IS_ITERATING
+--- misc/boost_1_39_0/boost/mpl/bind.hpp 2008-10-11 08:19:02.000000000 +0200
++++ misc/build/boost_1_39_0/boost/mpl/bind.hpp 2009-06-10 21:53:42.515625000 +0200
+@@ -531,7 +531,8 @@
+
+ ///// iteration, depth == 2
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 2
++#else
++#if BOOST_PP_ITERATION_DEPTH() == 2
+
+ # define j_ BOOST_PP_FRAME_ITERATION(2)
+ # if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
+@@ -548,4 +549,5 @@
+ # undef j_
+
+ #endif // BOOST_PP_ITERATION_DEPTH()
++#endif
+ #endif // BOOST_PP_IS_ITERATING
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp 2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp 2009-06-10 21:53:42.531250000 +0200
+@@ -19,12 +19,12 @@
+ : len(-1), val() {}
+
+ template <typename T>
+- inline match<T>::match(std::size_t length)
+- : len(length), val() {}
++ inline match<T>::match(std::size_t _length)
++ : len(_length), val() {}
+
+ template <typename T>
+- inline match<T>::match(std::size_t length, ctor_param_t val_)
+- : len(length), val(val_) {}
++ inline match<T>::match(std::size_t _length, ctor_param_t val_)
++ : len(_length), val(val_) {}
+
+ template <typename T>
+ inline bool
+@@ -66,11 +66,11 @@
+ inline match<nil_t>::match()
+ : len(-1) {}
+
+- inline match<nil_t>::match(std::size_t length)
+- : len(length) {}
++ inline match<nil_t>::match(std::size_t _length)
++ : len(_length) {}
+
+- inline match<nil_t>::match(std::size_t length, nil_t)
+- : len(length) {}
++ inline match<nil_t>::match(std::size_t _length, nil_t)
++ : len(_length) {}
+
+ inline bool
+ match<nil_t>::operator!() const
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2009-06-10 21:53:42.546875000 +0200
+@@ -226,7 +226,7 @@
+ template <typename ParserT, typename ScannerT, typename AttrT>
+ struct concrete_parser : abstract_parser<ScannerT, AttrT>
+ {
+- concrete_parser(ParserT const& p) : p(p) {}
++ concrete_parser(ParserT const& _p) : p(_p) {}
+ virtual ~concrete_parser() {}
+
+ virtual typename match_result<ScannerT, AttrT>::type
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2009-06-10 21:53:42.562500000 +0200
+@@ -106,7 +106,7 @@
+ : parser_id(reinterpret_cast<std::size_t>(this));
+ }
+
+- void set_id(parser_id id) { tag = id; }
++ void set_id(parser_id _id) { tag = _id; }
+
+ private:
+
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp 2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp 2009-07-08 22:23:45.899895415 +0200
+@@ -159,11 +159,11 @@
+ return ptr.get();
+ }
+
+- rule(abstract_parser_t* ptr)
+- : ptr(ptr) {}
++ rule(abstract_parser_t* _ptr)
++ : ptr(_ptr) {}
+
+- rule(abstract_parser_t const* ptr)
+- : ptr(ptr) {}
++ rule(abstract_parser_t const* _ptr)
++ : ptr(_ptr) {}
+
+ scoped_ptr<abstract_parser_t> ptr;
+ };
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2009-06-10 21:53:42.593750000 +0200
+@@ -210,7 +210,7 @@
+ subrule_list<
+ subrule_parser<ID2, DefT2, ContextT2>,
+ nil_t> >
+- operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
++ operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
+ {
+ return subrule_list<
+ self_t,
+@@ -220,7 +220,7 @@
+ *this,
+ subrule_list<
+ subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
+- rhs, nil_t()));
++ _rhs, nil_t()));
+ }
+
+ typename DefT::embed_t rhs;
+@@ -258,10 +258,10 @@
+ parse_main(ScannerT const& scan) const
+ {
+ typedef typename parser_result<self_t, ScannerT>::type result_t;
+- result_t result;
++ result_t _result;
+ impl::parse_subrule<result_t, ScannerT, ID>::
+- do_(result, scan);
+- return result;
++ do_(_result, scan);
++ return _result;
+ }
+
+ template <typename ScannerT>