summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-06-08 15:13:43 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-06-08 15:13:43 +0000
commitbbc2578362e06af9b92eb6227b87934b3cb0b828 (patch)
treed9f224fd537b2ed604ef2d20d861e13abcdf83b8 /boost
parentc6455cea36ccbdc87b65961aab1a9e5fbcab67c2 (diff)
#i10000# removal of cws helplinker01
Diffstat (limited to 'boost')
-rw-r--r--boost/boost-1.30.2.patch42
-rw-r--r--boost/prj/d.lst3
-rw-r--r--boost/spirit-1.6.1.patch147
3 files changed, 0 insertions, 192 deletions
diff --git a/boost/boost-1.30.2.patch b/boost/boost-1.30.2.patch
index c65b483cf3a4..6a42e93f80d0 100644
--- a/boost/boost-1.30.2.patch
+++ b/boost/boost-1.30.2.patch
@@ -668,45 +668,3 @@
+
#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>
diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index 5cc2c5bc35c4..937d0e3c32dc 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -2,9 +2,6 @@ mkdir: %_DEST%\inc%_EXT%\boost
..\%__SRC%\misc\build\boost-1.30.2\boost\rational.hpp %_DEST%\inc%_EXT%\boost\rational.hpp
..\%__SRC%\misc\build\boost-1.30.2\boost\operators.hpp %_DEST%\inc%_EXT%\boost\operators.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\tokenizer.hpp %_DEST%\inc%_EXT%\boost\tokenizer.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\token_iterator.hpp %_DEST%\inc%_EXT%\boost\token_iterator.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\token_functions.hpp %_DEST%\inc%_EXT%\boost\token_functions.hpp
..\%__SRC%\misc\build\boost-1.30.2\boost\enable_shared_from_this.hpp %_DEST%\inc%_EXT%\boost\enable_shared_from_this.hpp
..\%__SRC%\misc\build\boost-1.30.2\boost\cast.hpp %_DEST%\inc%_EXT%\boost\cast.hpp
diff --git a/boost/spirit-1.6.1.patch b/boost/spirit-1.6.1.patch
index 389561666432..f2320eec4a05 100644
--- a/boost/spirit-1.6.1.patch
+++ b/boost/spirit-1.6.1.patch
@@ -1564,150 +1564,3 @@
+ #endif
+
#endif // BOOST_UTILITY_ADDRESSOF_HPP
-*** misc/spirit-1.6.1/miniboost/boost/concept_check.hpp 2007-05-20 07:38:14.000000000 -0400
---- misc/build/spirit-1.6.1/miniboost/boost/concept_check.hpp 2007-05-20 07:52:59.000000000 -0400
-***************
-*** 708,719 ****
- function_requires< AssignableConcept<Container> >();
- const_constraints(c);
- }
-! void const_constraints(const Container& c) {
-! i = c.begin();
-! i = c.end();
-! n = c.size();
-! n = c.max_size();
-! b = c.empty();
- }
- Container c;
- bool b;
---- 708,719 ----
- function_requires< AssignableConcept<Container> >();
- const_constraints(c);
- }
-! void const_constraints(const Container& cnr) {
-! i = cnr.begin();
-! i = cnr.end();
-! n = cnr.size();
-! n = cnr.max_size();
-! b = cnr.empty();
- }
- Container c;
- bool b;
-***************
-*** 777,785 ****
- BidirectionalIteratorConcept<const_reverse_iterator> >();
- const_constraints(c);
- }
-! void const_constraints(const ReversibleContainer& c) {
-! const_reverse_iterator i = c.rbegin();
-! i = c.rend();
- }
- ReversibleContainer c;
- };
---- 777,785 ----
- BidirectionalIteratorConcept<const_reverse_iterator> >();
- const_constraints(c);
- }
-! void const_constraints(const ReversibleContainer& cnr) {
-! const_reverse_iterator i = cnr.rbegin();
-! i = cnr.rend();
- }
- ReversibleContainer c;
- };
-***************
-*** 821,828 ****
-
- const_constraints(c);
- }
-! void const_constraints(const RandomAccessContainer& c) {
-! const_reference r = c[n];
- ignore_unused_variable_warning(r);
- }
- RandomAccessContainer c;
---- 821,828 ----
-
- const_constraints(c);
- }
-! void const_constraints(const RandomAccessContainer& cnr) {
-! const_reference r = cnr[n];
- ignore_unused_variable_warning(r);
- }
- RandomAccessContainer c;
-***************
-*** 925,932 ****
- reference r = c.back();
- ignore_unused_variable_warning(r);
- }
-! void const_constraints(const BackInsertionSequence& c) {
-! const_reference r = c.back();
- ignore_unused_variable_warning(r);
- };
- BackInsertionSequence c;
---- 925,932 ----
- reference r = c.back();
- ignore_unused_variable_warning(r);
- }
-! void const_constraints(const BackInsertionSequence& cnr) {
-! const_reference r = cnr.back();
- ignore_unused_variable_warning(r);
- };
- BackInsertionSequence c;
-***************
-*** 947,956 ****
- c.erase(r.first, r.second);
- const_constraints(c);
- }
-! void const_constraints(const AssociativeContainer& c) {
-! ci = c.find(k);
-! n = c.count(k);
-! cr = c.equal_range(k);
- }
- typedef typename AssociativeContainer::iterator iterator;
- typedef typename AssociativeContainer::const_iterator const_iterator;
---- 947,956 ----
- c.erase(r.first, r.second);
- const_constraints(c);
- }
-! void const_constraints(const AssociativeContainer& cnr) {
-! ci = cnr.find(k);
-! n = cnr.count(k);
-! cr = cnr.equal_range(k);
- }
- typedef typename AssociativeContainer::iterator iterator;
- typedef typename AssociativeContainer::const_iterator const_iterator;
-*** misc/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp Wed May 23 19:45:34 2007
---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp Wed May 23 19:47:00 2007
-***************
-*** 72,78 ****
- #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT
- #undef BOOST_TT_CHOOSE_T
-
-! template<int TAlign, int Align>
- struct is_aligned
- {
- BOOST_STATIC_CONSTANT(bool,
---- 72,78 ----
- #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT
- #undef BOOST_TT_CHOOSE_T
-
-! template<std::size_t TAlign, std::size_t Align>
- struct is_aligned
- {
- BOOST_STATIC_CONSTANT(bool,
-***************
-*** 93,99 ****
-
- // This alignment method originally due to Brian Parker, implemented by David
- // Abrahams, and then ported here by Doug Gregor.
-! template <int Align>
- class type_with_alignment
- {
- typedef detail::lower_alignment<Align> t1;
---- 93,99 ----
-
- // This alignment method originally due to Brian Parker, implemented by David
- // Abrahams, and then ported here by Doug Gregor.
-! template <std::size_t Align>
- class type_with_alignment
- {
- typedef detail::lower_alignment<Align> t1;