diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:00:23 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:00:23 +0000 |
commit | ea509369724fbf1cbda2d77ac792f4785d54ec85 (patch) | |
tree | f4f5524462e3b0cf0f606509dacbe0cbf2b674e6 /boost | |
parent | 0bb158e1fafc3b132c8b2324d314d0ec844dc2ae (diff) |
INTEGRATION: CWS boostup01 (1.1.2); FILE ADDED
2007/11/14 18:02:18 thb 1.1.2.3: #i77672# WaE fixes thx to pjanik
2007/11/08 14:00:45 thb 1.1.2.2: #i77672# Tentatively enabling boost 1.34.1 for gcc4.x
2007/10/11 14:24:17 thb 1.1.2.1: #i77672# Initial revision for boost 1.34
Diffstat (limited to 'boost')
-rw-r--r-- | boost/boost_1_34_1.patch | 235 |
1 files changed, 235 insertions, 0 deletions
diff --git a/boost/boost_1_34_1.patch b/boost/boost_1_34_1.patch new file mode 100644 index 0000000..78b787d --- /dev/null +++ b/boost/boost_1_34_1.patch @@ -0,0 +1,235 @@ +*** misc/boost_1_34_1/boost/config/compiler/visualc.hpp 2006-01-13 11:48:08.000000000 +0100 +--- misc/build/boost_1_34_1/boost/config/compiler/visualc.hpp 2007-10-16 15:53:00.689904000 +0200 +*************** +*** 108,113 **** +--- 108,116 ---- + # define BOOST_DISABLE_WIN32 + #endif + ++ // disable WORKAROUND macro - gives warning for undefined macros ++ #define BOOST_STRICT_CONFIG ++ + // + // all versions support __declspec: + // +*** misc/boost_1_34_1/boost/spirit/core/impl/match.ipp Wed Jul 14 16:24:02 2004 +--- misc/build/boost_1_34_1/boost/spirit/core/impl/match.ipp Wed Nov 14 18:47:30 2007 +*************** +*** 17,28 **** + : len(-1), val() {} + + template <typename T> +! 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_) {} + + template <typename T> + inline bool +--- 17,28 ---- + : len(-1), val() {} + + template <typename T> +! 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_) {} + + template <typename T> + inline bool +*************** +*** 64,74 **** + 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, nil_t) +! : len(length) {} + + inline bool + match<nil_t>::operator!() const +--- 64,74 ---- + 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, nil_t) +! : len(_length) {} + + inline bool + match<nil_t>::operator!() const +*** misc/boost_1_34_1/boost/spirit/core/non_terminal/impl/rule.ipp Fri Jul 9 10:28:02 2004 +--- misc/build/boost_1_34_1/boost/spirit/core/non_terminal/impl/rule.ipp Wed Nov 14 18:47:30 2007 +*************** +*** 224,230 **** + template <typename ParserT, typename ScannerT, typename AttrT> + struct concrete_parser : abstract_parser<ScannerT, AttrT> + { +! concrete_parser(ParserT const& p) : p(p) {} + virtual ~concrete_parser() {} + + virtual typename match_result<ScannerT, AttrT>::type +--- 224,230 ---- + template <typename ParserT, typename ScannerT, typename AttrT> + struct concrete_parser : abstract_parser<ScannerT, AttrT> + { +! concrete_parser(ParserT const& _p) : p(_p) {} + virtual ~concrete_parser() {} + + virtual typename match_result<ScannerT, AttrT>::type +*** misc/boost_1_34_1/boost/spirit/core/non_terminal/parser_id.hpp Mon Jan 17 02:01:52 2005 +--- misc/build/boost_1_34_1/boost/spirit/core/non_terminal/parser_id.hpp Wed Nov 14 18:47:30 2007 +*************** +*** 104,110 **** + : parser_id(reinterpret_cast<std::size_t>(this)); + } + +! void set_id(parser_id id) { tag = id; } + + private: + +--- 104,110 ---- + : parser_id(reinterpret_cast<std::size_t>(this)); + } + +! void set_id(parser_id _id) { tag = _id; } + + private: + +*** misc/boost_1_34_1/boost/spirit/core/non_terminal/rule.hpp Fri Jul 9 10:28:01 2004 +--- misc/build/boost_1_34_1/boost/spirit/core/non_terminal/rule.hpp Wed Nov 14 18:47:30 2007 +*************** +*** 157,164 **** + return ptr.get(); + } + +! rule(abstract_parser_t const* ptr) +! : ptr(ptr) {} + + scoped_ptr<abstract_parser_t> ptr; + }; +--- 157,164 ---- + return ptr.get(); + } + +! rule(abstract_parser_t const* _ptr) +! : ptr(_ptr) {} + + scoped_ptr<abstract_parser_t> ptr; + }; +*** misc/boost_1_34_1/boost/spirit/core/non_terminal/subrule.hpp Thu Feb 9 00:05:38 2006 +--- misc/build/boost_1_34_1/boost/spirit/core/non_terminal/subrule.hpp Wed Nov 14 18:47:30 2007 +*************** +*** 208,214 **** + subrule_list< + subrule_parser<ID2, DefT2, ContextT2>, + nil_t> > +! operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const + { + return subrule_list< + self_t, +--- 208,214 ---- + subrule_list< + subrule_parser<ID2, DefT2, ContextT2>, + nil_t> > +! operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const + { + return subrule_list< + self_t, +*************** +*** 218,224 **** + *this, + subrule_list< + subrule_parser<ID2, DefT2, ContextT2>, nil_t>( +! rhs, nil_t())); + } + + typename DefT::embed_t rhs; +--- 218,224 ---- + *this, + subrule_list< + subrule_parser<ID2, DefT2, ContextT2>, nil_t>( +! _rhs, nil_t())); + } + + typename DefT::embed_t rhs; +*************** +*** 256,265 **** + parse_main(ScannerT const& scan) const + { + typedef typename parser_result<self_t, ScannerT>::type result_t; +! result_t result; + impl::parse_subrule<result_t, ScannerT, ID>:: +! do_(result, scan); +! return result; + } + + template <typename ScannerT> +--- 256,265 ---- + parse_main(ScannerT const& scan) const + { + typedef typename parser_result<self_t, ScannerT>::type result_t; +! result_t _result; + impl::parse_subrule<result_t, ScannerT, ID>:: +! do_(_result, scan); +! return _result; + } + + template <typename ScannerT> +*** misc/boost_1_34_1/boost/spirit/core/scanner/scanner.hpp Thu Feb 9 00:05:39 2006 +--- misc/build/boost_1_34_1/boost/spirit/core/scanner/scanner.hpp Wed Nov 14 18:47:30 2007 +*************** +*** 242,263 **** + bool + at_end() const + { +! typedef typename PoliciesT::iteration_policy_t iteration_policy_t; +! return iteration_policy_t::at_end(*this); + } + + value_t + operator*() const + { +! typedef typename PoliciesT::iteration_policy_t iteration_policy_t; +! return iteration_policy_t::filter(iteration_policy_t::get(*this)); + } + + scanner const& + operator++() const + { +! typedef typename PoliciesT::iteration_policy_t iteration_policy_t; +! iteration_policy_t::advance(*this); + return *this; + } + +--- 242,263 ---- + bool + at_end() const + { +! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; +! return _iteration_policy_t::at_end(*this); + } + + value_t + operator*() const + { +! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; +! return _iteration_policy_t::filter(_iteration_policy_t::get(*this)); + } + + scanner const& + operator++() const + { +! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; +! _iteration_policy_t::advance(*this); + return *this; + } + |