diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 11:39:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 11:39:49 +0000 |
| commit | cbb1a320683efdffd8d2b758b8cd2357b8fe2bcd (patch) | |
| tree | 4a71ae150103352f2ea2d44ba3259c30f9161851 /boost | |
| parent | e88e092b6186adeb7109ce3edb711cb7a8005751 (diff) | |
INTEGRATION: CWS helplinker01redux (1.9.2); FILE MERGED
2007/06/21 16:02:11 hjs 1.9.2.2: #i70155# reenabling the assert
2007/06/13 12:10:09 cmc 1.9.2.1: #i70155 export needed boost methods for HelpLinker
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost-1.30.2.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/boost/boost-1.30.2.patch b/boost/boost-1.30.2.patch index 24aca873278b..fe53de6ba274 100644 --- a/boost/boost-1.30.2.patch +++ b/boost/boost-1.30.2.patch @@ -692,3 +692,45 @@ + #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED +*** misc/build/boost-1.30.2/boost/token_functions.hpp 2007-05-20 07:38:11.000000000 -0400 +--- misc/modified/boost-1.30.2/boost/token_functions.hpp 2007-05-20 08:05:05.000000000 -0400 +*************** +*** 64,70 **** + // character (backslash \), can be assigned to other characters. + + struct escaped_list_error : public std::runtime_error{ +! escaped_list_error(const std::string& what):std::runtime_error(what) { } + }; + + +--- 64,70 ---- + // character (backslash \), can be assigned to other characters. + + struct escaped_list_error : public std::runtime_error{ +! escaped_list_error(const std::string& s_what) : std::runtime_error(s_what) { } + }; + + +*** misc/build/boost-1.30.2/boost/token_iterator.hpp 2007-05-20 07:38:10.000000000 -0400 +--- misc/modified/boost-1.30.2/boost/token_iterator.hpp 2007-05-20 08:10:20.000000000 -0400 +*************** +*** 64,72 **** + + template<class Iterator> + typename Iterator::reference +! dereference(const Iterator& a) const{ + using namespace std; +! assert(a.base().valid_); + return tok_; + } + template <class Iterator> +--- 64,72 ---- + + template<class Iterator> + typename Iterator::reference +! dereference(const Iterator& iter ) const{ + using namespace std; +! (void)iter; assert(iter.base().valid_); + return tok_; + } + template <class Iterator> |