diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:26:04 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:26:04 +0000 |
| commit | 0b3270f6fe2778a0d545a5af54a7debd87bc6eb6 (patch) | |
| tree | 6d7882e39ebd146ed43aab59d7c7de5de7a56d71 | |
| parent | a0f14cd289ccd293f13fa13ae523e65e93d63cd4 (diff) | |
INTEGRATION: CWS helplinker01 (1.7.2); FILE MERGED
2007/05/20 12:20:10 cmc 1.7.2.1: #i70155# remove warnings from newly used boost/spirit headers
| -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 6a42e93f80d0..c65b483cf3a4 100644 --- a/boost/boost-1.30.2.patch +++ b/boost/boost-1.30.2.patch @@ -668,3 +668,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& /*a*/) const{ + using namespace std; +! //assert(a.base().valid_); + return tok_; + } + template <class Iterator> |