diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 10:22:12 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 10:22:12 +0000 |
| commit | 2bd05b18daeaab1c28cd383701ba462568e1ad35 (patch) | |
| tree | 892c942be1310a0f9b65a5d9dca853301ff13f52 /boost | |
| parent | a5ff891b914dad7aaf1f06d47b28ccbb7f3f636c (diff) | |
INTEGRATION: CWS ipdf (1.4.6); FILE MERGED
2006/11/27 14:38:42 pl 1.4.6.2: RESYNC: (1.4-1.6); FILE MERGED
2006/07/25 13:03:43 pl 1.4.6.1: removed a stray semicolon in confix.hpp
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost-1.30.2.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/boost/boost-1.30.2.patch b/boost/boost-1.30.2.patch index 4c534a97cd3b..6a42e93f80d0 100644 --- a/boost/boost-1.30.2.patch +++ b/boost/boost-1.30.2.patch @@ -1,5 +1,5 @@ *** misc/boost-1.30.2/boost/bind.hpp Tue Oct 15 12:51:34 2002 ---- misc/build/boost-1.30.2/boost/bind.hpp Thu Jan 26 17:10:47 2006 +--- misc/build/boost-1.30.2/boost/bind.hpp Tue Jul 25 14:47:06 2006 *************** *** 5,10 **** --- 5,17 ---- @@ -186,7 +186,7 @@ function_base::functor = detail::function::make_any_pointer(this); } *** misc/boost-1.30.2/boost/function.hpp Fri Feb 14 16:34:39 2003 ---- misc/build/boost-1.30.2/boost/function.hpp Thu Jan 26 17:10:47 2006 +--- misc/build/boost-1.30.2/boost/function.hpp Tue Jul 25 14:47:06 2006 *************** *** 16,21 **** --- 16,26 ---- @@ -202,17 +202,18 @@ #include <boost/detail/workaround.hpp> *************** -*** 68,70 **** ---- 73,79 ---- +*** 67,70 **** +--- 72,79 ---- + # define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_FUNCTION_MAX_ARGS,<boost/function/detail/function_iterate.hpp>)) # include BOOST_PP_ITERATE() # undef BOOST_PP_ITERATION_PARAMS_1 - #endif ++ #endif + + #if defined _MSC_VER + #pragma warning(pop) -+ #endif + #endif *** misc/boost-1.30.2/boost/mem_fn.hpp Fri Dec 20 19:14:59 2002 ---- misc/build/boost-1.30.2/boost/mem_fn.hpp Thu Jan 26 17:10:47 2006 +--- misc/build/boost-1.30.2/boost/mem_fn.hpp Tue Jul 25 14:47:06 2006 *************** *** 5,10 **** --- 5,17 ---- @@ -666,3 +667,4 @@ + #endif + #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED + |