diff -Nru stl-manual-3.30/debian/changelog stl-manual-3.30/debian/changelog --- stl-manual-3.30/debian/changelog 2010-02-10 10:48:18.000000000 +0000 +++ stl-manual-3.30/debian/changelog 2010-12-22 04:26:59.000000000 +0000 @@ -1,3 +1,10 @@ +stl-manual (3.30-12) unstable; urgency=low + + * Bump Standards-Version to 3.9.1 + * Bump debhelper compatibility to 8 + + -- Francois Marier Wed, 22 Dec 2010 17:26:33 +1300 + stl-manual (3.30-11) unstable; urgency=low * Bump Standards-Version to 3.8.4 diff -Nru stl-manual-3.30/debian/compat stl-manual-3.30/debian/compat --- stl-manual-3.30/debian/compat 2010-02-10 10:48:18.000000000 +0000 +++ stl-manual-3.30/debian/compat 2010-12-22 04:26:59.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru stl-manual-3.30/debian/control stl-manual-3.30/debian/control --- stl-manual-3.30/debian/control 2010-02-10 10:48:18.000000000 +0000 +++ stl-manual-3.30/debian/control 2010-12-22 04:26:59.000000000 +0000 @@ -2,8 +2,8 @@ Section: doc Priority: optional Maintainer: Francois Marier -Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 7) +Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 8) Homepage: http://www.sgi.com/tech/stl/ Vcs-git: git://git.debian.org/git/collab-maint/stl-manual.git Vcs-Browser: http://git.debian.org/?p=collab-maint/stl-manual.git;a=summary diff -Nru stl-manual-3.30/debian/patches/debian-changes-3.30-11 stl-manual-3.30/debian/patches/debian-changes-3.30-11 --- stl-manual-3.30/debian/patches/debian-changes-3.30-11 2010-02-10 10:48:34.000000000 +0000 +++ stl-manual-3.30/debian/patches/debian-changes-3.30-11 1970-01-01 00:00:00.000000000 +0000 @@ -1,11792 +0,0 @@ -Description: Upstream changes introduced in version 3.30-11 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - stl-manual (3.30-11) unstable; urgency=low - . - * Bump Standards-Version to 3.8.4 - * Switch to 3.0 (quilt) source format - * Add dependency on ${misc:Depends} - . - The person named in the Author field signed this changelog entry. -Author: Francois Marier - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- stl-manual-3.30.orig/logical_not.html -+++ stl-manual-3.30/logical_not.html -@@ -132,7 +132,7 @@ The type of the result: bool - - - --bool operator()(const T& x) const -+bool operator()(const T& x) const - - - Unary Function -@@ -143,7 +143,7 @@ Function call operator. The return valu - - - --logical_not() -+logical_not() - - - Default Constructible ---- stl-manual-3.30.orig/char_producer.html -+++ stl-manual-3.30/char_producer.html -@@ -182,7 +182,7 @@ Description - - - --virtual ~char_producer() -+virtual ~char_producer() - - - char_producer ---- stl-manual-3.30.orig/ReverseBidirectionalIterator.html -+++ stl-manual-3.30/ReverseBidirectionalIterator.html -@@ -196,7 +196,7 @@ See below - - - --reverse_bidirectional_iterator() -+reverse_bidirectional_iterator() - - - Trivial Iterator -@@ -207,7 +207,7 @@ The default constructor - - - --reverse_bidirectional_iterator(const reverse_bidirectional_iterator& x) -+reverse_bidirectional_iterator(const reverse_bidirectional_iterator& x) - - - Trivial Iterator -@@ -218,7 +218,7 @@ The copy constructor - - - --reverse_bidirectional_iterator& operator=(const reverse_bidirectional_iterator& x) -+reverse_bidirectional_iterator& operator=(const reverse_bidirectional_iterator& x) - - - Trivial Iterator -@@ -229,7 +229,7 @@ The assignment operator - - - --reverse_bidirectional_iterator(BidirectionalIterator x) -+reverse_bidirectional_iterator(BidirectionalIterator x) - - - reverse_bidirectional_iterator -@@ -240,7 +240,7 @@ See below. - - - --BidirectionalIterator base() -+BidirectionalIterator base() - - - reverse_bidirectional_iterator -@@ -251,7 +251,7 @@ See below. - - - --Reference operator*() const -+Reference operator*() const - - - Trivial Iterator -@@ -262,7 +262,7 @@ The dereference operator - - - --reverse_bidirectional_iterator& operator++() -+reverse_bidirectional_iterator& operator++() - - - Forward Iterator -@@ -273,7 +273,7 @@ Preincrement - - - --reverse_bidirectional_iterator operator++(int) -+reverse_bidirectional_iterator operator++(int) - - - Forward Iterator -@@ -284,7 +284,7 @@ Postincrement - - - --reverse_bidirectional_iterator& operator--() -+reverse_bidirectional_iterator& operator--() - - - Bidirectional Iterator -@@ -295,7 +295,7 @@ Predecrement - - - --reverse_bidirectional_iterator operator--(int) -+reverse_bidirectional_iterator operator--(int) - - - Bidirectional Iterator -@@ -306,7 +306,7 @@ Postdecrement - - - --bool operator==(const reverse_bidirectional_iterator&, const reverse_bidirectional_iterator&) -+bool operator==(const reverse_bidirectional_iterator&, const reverse_bidirectional_iterator&) - - - Trivial Iterator -@@ -318,7 +318,7 @@ Compares two iterators for equality. - - - --bidirectional_iterator_tag iterator_category(const reverse_bidirectional_iterator&) -+bidirectional_iterator_tag iterator_category(const reverse_bidirectional_iterator&) - - - Iterator tags -@@ -330,7 +330,7 @@ Returns the iterator's category. - - - --T* value_type(const reverse_bidirectional_iterator&) -+T* value_type(const reverse_bidirectional_iterator&) - - - Iterator tags -@@ -342,7 +342,7 @@ Returns the iterator's value type. - - - --Distance* distance_type(const reverse_bidirectional_iterator&) -+Distance* distance_type(const reverse_bidirectional_iterator&) - - - Iterator tags -@@ -377,7 +377,7 @@ A typedef for reverse_bidirectional_ - - - --BidirectionalIterator base() -+BidirectionalIterator base() - - - Returns the current value of the reverse_bidirectional_iterator's base iterator. -@@ -389,7 +389,7 @@ Returns the current value of the rev - - - --reverse_bidirectional_iterator(BidirectionalIterator i) -+reverse_bidirectional_iterator(BidirectionalIterator i) - - - Constructs a reverse_bidirectional_iterator whose base iterator is i. ---- stl-manual-3.30.orig/select2nd.html -+++ stl-manual-3.30/select2nd.html -@@ -140,7 +140,7 @@ The type of the result: Pair::second - - - const Pair::second_type& --operator()(const Pair& p) const -+operator()(const Pair& p) const - - - ---- stl-manual-3.30.orig/mem_fun_ref_t.html -+++ stl-manual-3.30/mem_fun_ref_t.html -@@ -195,7 +195,7 @@ The type of the result: Result - - - --Result operator()(X& x) const -+Result operator()(X& x) const - - - -@@ -209,7 +209,7 @@ Function call operator. Invokes x.f - - - --explicit mem_fun_ref_t(Result (X::*f)()) -+explicit mem_fun_ref_t(Result (X::*f)()) - - - -@@ -224,7 +224,7 @@ See below. - - template <class Result, class X> - mem_fun_ref_t<Result, X> --mem_fun_ref(Result (X::*f)()); -+mem_fun_ref(Result (X::*f)()); - - - -@@ -252,7 +252,7 @@ Description - - - --explicit mem_fun_ref_t(Result (X::*f)()) -+explicit mem_fun_ref_t(Result (X::*f)()) - - - -@@ -265,7 +265,7 @@ The constructor. Creates a mem_fun_ - - template <class Result, class X> - mem_fun_ref_t<Result, X> --mem_fun_ref(Result (X::*f)()); -+mem_fun_ref(Result (X::*f)()); - - - ---- stl-manual-3.30.orig/negate.html -+++ stl-manual-3.30/negate.html -@@ -138,7 +138,7 @@ The type of the result: T - - - --T operator()(const T& x) -+T operator()(const T& x) - - - Adaptable Unary Function -@@ -149,7 +149,7 @@ Function call operator. The return valu - - - --negate() -+negate() - - - Default Constructible ---- stl-manual-3.30.orig/binary_compose.html -+++ stl-manual-3.30/binary_compose.html -@@ -192,7 +192,7 @@ The type of the result: AdaptableBin - - - --binary_compose(const AdaptableBinaryFunction& f, -+binary_compose(const AdaptableBinaryFunction& f, - const AdaptableUnaryFunction1& g1, - const AdaptableUnaryFunction1& g2); - -@@ -213,7 +213,7 @@ template <class compose2(const AdaptableBinaryFunction&, - const AdaptableUnaryFunction1&, - const AdaptableUnaryFunction2&); - ---- stl-manual-3.30.orig/bitset.html -+++ stl-manual-3.30/bitset.html -@@ -139,7 +139,7 @@ A proxy class that acts as a reference t - - - --bitset() -+bitset() - - - Default Constructible -@@ -150,10 +150,10 @@ The default constructor. All bits are i - - - --bitset(unsigned long val) -+bitset(unsigned long val) - - --bitset -+bitset - - - Conversion from unsigned long. -@@ -161,7 +161,7 @@ Conversion from unsigned long. - - - --bitset(const bitset&) -+bitset(const bitset&) - - - Assignable -@@ -172,7 +172,7 @@ Copy constructor. - - - --bitset& operator=(const bitset&) -+bitset& operator=(const bitset&) - - - Assignable -@@ -186,7 +186,7 @@ Assignment operator. - - template<class Char, class Traits, class Alloc> - explicit --bitset(const basic_string<Char,Traits,Alloc>& s, -+bitset(const basic_string<Char,Traits,Alloc>& s, - size_t pos = 0, - size_t n = - basic_string<Char,Traits,Alloc>::npos) -@@ -201,7 +201,7 @@ Conversion from string. - - - --bitset& operator&=(const bitset&) -+bitset& operator&=(const bitset&) - - - bitset -@@ -212,7 +212,7 @@ Bitwise and. - - - --bitset& operator|=(const bitset&) -+bitset& operator|=(const bitset&) - - - bitset -@@ -223,7 +223,7 @@ Bitwise inclusive or. - - - --bitset& operator^=(const bitset&) -+bitset& operator^=(const bitset&) - - - bitset -@@ -234,7 +234,7 @@ Bitwise exclusive or. - - - --bitset& operator<<=(size_t) -+bitset& operator<<=(size_t) - - - bitset -@@ -245,7 +245,7 @@ Left shift. - - - --bitset& operator>>=(size_t) -+bitset& operator>>=(size_t) - - - bitset -@@ -256,7 +256,7 @@ Right shift. - - - --bitset operator<<(size_t n) const -+bitset operator<<(size_t n) const - - - bitset -@@ -267,7 +267,7 @@ Returns a copy of *this shifted - - - --bitset operator>>(size_t n) const -+bitset operator>>(size_t n) const - - - bitset -@@ -278,7 +278,7 @@ Returns a copy of *this shifted - - - --bitset& set() -+bitset& set() - - - bitset -@@ -289,7 +289,7 @@ Sets every bit. - - - --bitset& flip() -+bitset& flip() - - - bitset -@@ -300,7 +300,7 @@ Flips the value of every bit. - - - --bitset operator~() const -+bitset operator~() const - - - bitset -@@ -311,7 +311,7 @@ Returns a copy of *this with al - - - --bitset& reset() -+bitset& reset() - - - bitset -@@ -322,7 +322,7 @@ Clears every bit. - - - --bitset& set(size_t n, int val = 1) -+bitset& set(size_t n, int val = 1) - - - bitset -@@ -333,7 +333,7 @@ Sets bit n if val is n - - - --bitset& reset(size_t n) -+bitset& reset(size_t n) - - - bitset -@@ -344,7 +344,7 @@ Clears bit n. - - - --bitset flip(size_t n) -+bitset flip(size_t n) - - - bitset -@@ -355,7 +355,7 @@ Flips bit n. - - - --size_t size() const -+size_t size() const - - - bitset -@@ -366,7 +366,7 @@ Returns N. - - - --size_t count() const -+size_t count() const - - - bitset -@@ -377,7 +377,7 @@ Returns the number of bits that are set. - - - --bool any() const -+bool any() const - - - bitset -@@ -388,7 +388,7 @@ Returns true if any bits are se - - - --bool none() const -+bool none() const - - - bitset -@@ -399,7 +399,7 @@ Returns true if no bits are set - - - --bool test(size_t n) const -+bool test(size_t n) const - - - bitset -@@ -410,7 +410,7 @@ Returns true if bit n - - - --reference operator[](size_t n) -+reference operator[](size_t n) - - - bitset -@@ -421,7 +421,7 @@ Returns a reference to bit - - - --bool operator[](size_t n) const -+bool operator[](size_t n) const - - - bitset -@@ -432,7 +432,7 @@ Returns true if bit n - - - --unsigned long to_ulong() const -+unsigned long to_ulong() const - - - bitset -@@ -445,7 +445,7 @@ Returns an unsigned long corres - - - template<class Char, class Traits, class Alloc> --basic_string<Char,Traits,Alloc> to_string() const -+basic_string<Char,Traits,Alloc> to_string() const - - - -@@ -457,7 +457,7 @@ Returns a string representation of * - - - --bool operator==(const bitset&) const -+bool operator==(const bitset&) const - - - Equality Comparable -@@ -468,7 +468,7 @@ The equality operator. - - - --bool operator!=(const bitset&) const -+bool operator!=(const bitset&) const - - - Equality Comparable -@@ -479,7 +479,7 @@ The inequality operator. - - - --bitset operator&(const bitset&, const bitset&) -+bitset operator&(const bitset&, const bitset&) - - - bitset -@@ -491,7 +491,7 @@ Bitwise and of two bitsets. This is a g - - - --bitset operator|(const bitset&, const bitset&) -+bitset operator|(const bitset&, const bitset&) - - - bitset -@@ -503,7 +503,7 @@ Bitwise or of two bitsets. This is a gl - - - --bitset operator^(const bitset&, const bitset&) -+bitset operator^(const bitset&, const bitset&) - - - bitset -@@ -519,7 +519,7 @@ Bitwise exclusive or of two bitsets. Th - template <class Char, class Traits, - size_t N> - basic_istream<Char,Traits>& --operator>>(basic_istream<Char,Traits>&, -+operator>>(basic_istream<Char,Traits>&, - bitset<N>&) - - -@@ -536,7 +536,7 @@ Extract a bitset from an input - template <class Char, class Traits, - size_t N> - basic_ostream<Char,Traits>& --operator>>(basic_ostream<Char,Traits>&, -+operator>>(basic_ostream<Char,Traits>&, - const bitset<N>&) - - -@@ -576,7 +576,7 @@ A proxy class that acts as a reference t - - - --bitset(unsigned long val) -+bitset(unsigned long val) - - - Conversion from unsigned long. Constructs a bitset, initializing -@@ -589,7 +589,7 @@ Conversion from unsigned long. Construc - - template<class Char, class Traits, class Alloc> - explicit --bitset(const basic_string<Char,Traits,Alloc>& s, -+bitset(const basic_string<Char,Traits,Alloc>& s, - size_t pos = 0, - size_t n = - basic_string<Char,Traits,Alloc>::npos) -@@ -610,7 +610,7 @@ Conversion from string. Constructs a bi - - - --bitset& operator&=(const bitset&) -+bitset& operator&=(const bitset&) - - - Bitwise and. -@@ -618,7 +618,7 @@ Bitwise and. - - - --bitset& operator|=(const bitset&) -+bitset& operator|=(const bitset&) - - - Bitwise inclusive or. -@@ -626,7 +626,7 @@ Bitwise inclusive or. - - - --bitset& operator^=(const bitset&) -+bitset& operator^=(const bitset&) - - - Bitwise exclusive or. -@@ -634,7 +634,7 @@ Bitwise exclusive or. - - - --bitset& operator<<=(size_t n) -+bitset& operator<<=(size_t n) - - - Left shift, where bit 0 is considered the least significant bit. -@@ -644,7 +644,7 @@ Left shift, where bit 0 is cons - - - --bitset& operator>>=(size_t n) -+bitset& operator>>=(size_t n) - - - Right shift, where bit 0 is considered the least significant bit. -@@ -654,7 +654,7 @@ Right shift, where bit 0 is con - - - --bitset operator<<(size_t n) const -+bitset operator<<(size_t n) const - - - Returns a copy of *this shifted left by n bits. -@@ -665,7 +665,7 @@ Returns a copy of *this shifted - - - --bitset operator>>(size_t n) const -+bitset operator>>(size_t n) const - - - Returns a copy of *this shifted right by n bits. -@@ -676,7 +676,7 @@ Returns a copy of *this shifted - - - --bitset& set() -+bitset& set() - - - Sets every bit. -@@ -684,7 +684,7 @@ Sets every bit. - - - --bitset& flip() -+bitset& flip() - - - Flips the value of every bit. -@@ -692,7 +692,7 @@ Flips the value of every bit. - - - --bitset operator~() const -+bitset operator~() const - - - Returns a copy of *this with all of its bits flipped. -@@ -700,7 +700,7 @@ Returns a copy of *this with al - - - --bitset& reset() -+bitset& reset() - - - Clears every bit. -@@ -708,7 +708,7 @@ Clears every bit. - - - --bitset& set(size_t n, int val = 1) -+bitset& set(size_t n, int val = 1) - - - Sets bit n if val is nonzero, and clears bit n if val is zero. -@@ -717,7 +717,7 @@ Sets bit n if val is n - - - --bitset& reset(size_t n) -+bitset& reset(size_t n) - - - Clears bit n. -@@ -726,7 +726,7 @@ Clears bit n. - - - --bitset flip(size_t n) -+bitset flip(size_t n) - - - Flips bit n. -@@ -735,7 +735,7 @@ Flips bit n. - - - --size_t size() const -+size_t size() const - - - Returns N. -@@ -743,7 +743,7 @@ Returns N. - - - --size_t count() const -+size_t count() const - - - Returns the number of bits that are set. -@@ -751,7 +751,7 @@ Returns the number of bits that are set. - - - --bool any() const -+bool any() const - - - Returns true if any bits are set. -@@ -759,7 +759,7 @@ Returns true if any bits are se - - - --bool none() const -+bool none() const - - - Returns true if no bits are set. -@@ -767,7 +767,7 @@ Returns true if no bits are set - - - --bool test(size_t n) const -+bool test(size_t n) const - - - Returns true if bit n is set. -@@ -776,7 +776,7 @@ Returns true if bit n - - - --reference operator[](size_t n) -+reference operator[](size_t n) - - - Returns a reference to bit n. Note that reference is a -@@ -787,7 +787,7 @@ Returns a reference to bit - - - --bool operator[](size_t n) const -+bool operator[](size_t n) const - - - Returns true if bit n is set. -@@ -795,7 +795,7 @@ Returns true if bit n - - - --unsigned long to_ulong() const -+unsigned long to_ulong() const - - - Returns an unsigned long corresponding to the bits in *this. -@@ -808,7 +808,7 @@ Returns an unsigned long corres - - - template<class Char, class Traits, class Alloc> --basic_string<Char,Traits,Alloc> to_string() const -+basic_string<Char,Traits,Alloc> to_string() const - - - -@@ -829,7 +829,7 @@ b.template to_string<char, char_trait - - - --bitset operator&(const bitset&, const bitset&) -+bitset operator&(const bitset&, const bitset&) - - - Bitwise and of two bitsets. This is a global function, -@@ -840,7 +840,7 @@ Bitwise and of two bitsets. This is a g - - - --bitset operator|(const bitset&, const bitset&) -+bitset operator|(const bitset&, const bitset&) - - - Bitwise or of two bitsets. This is a global function, -@@ -851,7 +851,7 @@ Bitwise or of two bitsets. This is a gl - - - --bitset operator^(const bitset&, const bitset&) -+bitset operator^(const bitset&, const bitset&) - - - Bitwise exclusive or of two bitsets. This is a global function, -@@ -866,7 +866,7 @@ Bitwise exclusive or of two bitsets. Th - template <class Char, class Traits, - size_t N> - basic_istream<Char, Traits>& --operator>>(basic_istream<Char,Traits>& is, -+operator>>(basic_istream<Char,Traits>& is, - bitset<N>& x) - - -@@ -890,7 +890,7 @@ Extract a bitset from an input - template <class Char, class Traits, - size_t N> - basic_ostream<Char,Traits>& --operator>>(basic_ostream<Char,Traits>& os, -+operator>>(basic_ostream<Char,Traits>& os, - const bitset<N>& x) - - ---- stl-manual-3.30.orig/less_equal.html -+++ stl-manual-3.30/less_equal.html -@@ -144,7 +144,7 @@ The type of the result: bool - - - --less_equal() -+less_equal() - - - DefaultConstructible -@@ -155,7 +155,7 @@ The default constructor. - - - --bool operator()(const T& x, const T& y) -+bool operator()(const T& x, const T& y) - - - Binary Function ---- stl-manual-3.30.orig/basic_string.html -+++ stl-manual-3.30/basic_string.html -@@ -306,7 +306,7 @@ Const iterator used to iterate backwards - - - --iterator begin() -+iterator begin() - - - Container -@@ -317,7 +317,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -328,7 +328,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -339,7 +339,7 @@ Returns a const_iterator pointi - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -350,7 +350,7 @@ Returns a const_iterator pointi - - - --reverse_iterator rbegin() -+reverse_iterator rbegin() - - - Reversible Container -@@ -362,7 +362,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() -+reverse_iterator rend() - - - Reversible Container -@@ -374,7 +374,7 @@ Returns a reverse_iterator poin - - - --const_reverse_iterator rbegin() const -+const_reverse_iterator begin() const - - - Reversible Container -@@ -386,7 +386,7 @@ Returns a const_reverse_iterator - - --const_reverse_iterator rend() const -+const_reverse_iterator rend() const - - - Reversible Container -@@ -398,7 +398,7 @@ Returns a const_reverse_iterator - - --size_type size() const -+size_type size() const - - - Container -@@ -409,7 +409,7 @@ Returns the size of the string. - - - --size_type length() const -+size_type length() const - - - basic_string -@@ -420,7 +420,7 @@ Synonym for size(). - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -431,7 +431,7 @@ Returns the largest possible size of the - - - --size_type capacity() const -+size_type capacity() const - - - basic_string -@@ -442,7 +442,7 @@ See below. - - - --bool empty() const -+bool empty() const - - - Container -@@ -453,7 +453,7 @@ See below. - - - --reference operator[](size_type n) -+reference operator[](size_type n) - - - Random Access Container -@@ -464,7 +464,7 @@ Returns the n'th character. - - - --const_reference operator[](size_type n) const -+const_reference operator[](size_type n) const - - - Random Access Container -@@ -475,7 +475,7 @@ Returns the n'th character. - - - --const charT* c_str() const -+const charT* c_str() const - - - basic_string -@@ -487,7 +487,7 @@ Returns a pointer to a null-terminated a - - - --const charT* data() const -+const charT* data() const - - - basic_string -@@ -499,7 +499,7 @@ Returns a pointer to an array of charact - - - --basic_string() -+basic_string() - - - Container -@@ -511,7 +511,7 @@ Creates an empty string. - - - --basic_string(const basic_string& s, -+basic_string(const basic_string& s, - size_type pos = 0, size_type n = npos) - - -@@ -524,7 +524,7 @@ Generalization of the copy constructor. - - - --basic_string(const charT*) -+basic_string(const charT*) - - - basic_string -@@ -535,7 +535,7 @@ Construct a string from a null-terminate - - - --basic_string(const charT* s, size_type n) -+basic_string(const charT* s, size_type n) - - - basic_string -@@ -546,7 +546,7 @@ Construct a string from a character arra - - - --basic_string(size_type n, charT c) -+basic_string(size_type n, charT c) - - - Sequence -@@ -559,7 +559,7 @@ Create a string with n copies o - - - template <class InputIterator> --basic_string(InputIterator first, InputIterator last) -+basic_string(InputIterator first, InputIterator last) - - - -@@ -571,7 +571,7 @@ Create a string from a range. - - - --~basic_string() -+~basic_string() - - - Container -@@ -582,7 +582,7 @@ The destructor. - - - --basic_string& operator=(const basic_string&) -+basic_string& operator=(const basic_string&) - - - Container -@@ -593,7 +593,7 @@ The assignment operator - - - --basic_string& operator=(const charT* s) -+basic_string& operator=(const charT* s) - - - basic_string -@@ -604,7 +604,7 @@ Assign a null-terminated character array - - - --basic_string& operator=(charT c) -+basic_string& operator=(charT c) - - - basic_string -@@ -615,7 +615,7 @@ Assign a single character to a string. - - - --void reserve(size_t) -+void reserve(size_t) - - - basic_string -@@ -626,7 +626,7 @@ See below. - - - --void swap(basic_string&) -+void swap(basic_string&) - - - Container -@@ -638,7 +638,7 @@ Swaps the contents of two strings. - - - --iterator insert(iterator pos, -+iterator insert(iterator pos, - const T& x) - - -@@ -653,7 +653,7 @@ Inserts x before pos. - - - template <class InputIterator> --void insert(iterator pos, -+void insert(iterator pos, - InputIterator f, InputIterator l) - [1] - -@@ -668,7 +668,7 @@ Inserts the range [first, last) - - - --void insert(iterator pos, -+void insert(iterator pos, - size_type n, const T& x) - - -@@ -681,7 +681,7 @@ Inserts n copies of x - - - --basic_string& insert(size_type pos, const basic_string& s) -+basic_string& insert(size_type pos, const basic_string& s) - - - basic_string -@@ -693,7 +693,7 @@ Inserts s before pos. - - - --basic_string& insert(size_type pos, -+basic_string& insert(size_type pos, - const basic_string& s, - size_type pos1, size_type n) - -@@ -707,7 +707,7 @@ Inserts a substring of s before - - - --basic_string& insert(size_type pos, const charT* s) -+basic_string& insert(size_type pos, const charT* s) - - - basic_string -@@ -718,7 +718,7 @@ Inserts s before pos. - - - --basic_string& insert(size_type pos, const charT* s, size_type n) -+basic_string& insert(size_type pos, const charT* s, size_type n) - - - basic_string -@@ -729,7 +729,7 @@ Inserts the first n characters of s< - - - --basic_string& insert(size_type pos, size_type n, charT c) -+basic_string& insert(size_type pos, size_type n, charT c) - - - basic_string -@@ -740,7 +740,7 @@ Inserts n copies of c - - - --basic_string& append(const basic_string& s) -+basic_string& append(const basic_string& s) - - - basic_string -@@ -752,7 +752,7 @@ Append s to *this. - - - --basic_string& append(const basic_string& s, -+basic_string& append(const basic_string& s, - size_type pos, size_type n) - - -@@ -765,7 +765,7 @@ Append a substring of s to - - - --basic_string& append(const charT* s) -+basic_string& append(const charT* s) - - - basic_string -@@ -776,7 +776,7 @@ Append s to *this. - - - --basic_string& append(const charT* s, size_type n) -+basic_string& append(const charT* s, size_type n) - - - basic_string -@@ -787,7 +787,7 @@ Append the first n characters o - - - --basic_string& append(size_type n, charT c) -+basic_string& append(size_type n, charT c) - - - basic_string -@@ -800,7 +800,7 @@ Append n copies of c t - - - template <class InputIterator> --basic_string& append(InputIterator first, InputIterator last) -+basic_string& append(InputIterator first, InputIterator last) - - - -@@ -812,7 +812,7 @@ Append a range to *this. - - - --void push_back(charT c) -+void push_back(charT c) - - - basic_string -@@ -823,7 +823,7 @@ Append a single character to *this - - --basic_string& operator+=(const basic_string& s) -+basic_string& operator+=(const basic_string& s) - - - basic_string -@@ -834,7 +834,7 @@ Equivalent to append(s). - - - --basic_string& operator+=(const charT* s) -+basic_string& operator+=(const charT* s) - - - basic_string -@@ -845,7 +845,7 @@ Equivalent to append(s) - - - --basic_string& operator+=(charT c) -+basic_string& operator+=(charT c) - - - basic_string -@@ -856,7 +856,7 @@ Equivalent to push_back(c) - - - --iterator erase(iterator p) -+iterator erase(iterator p) - - - Sequence -@@ -867,7 +867,7 @@ Erases the character at position p - - --iterator erase(iterator first, iterator last) -+iterator erase(iterator first, iterator last) - - - Sequence -@@ -878,7 +878,7 @@ Erases the range [first, last) - - - --basic_string& erase(size_type pos = 0, size_type n = npos) -+basic_string& erase(size_type pos = 0, size_type n = npos) - - - basic_string -@@ -889,7 +889,7 @@ Erases a range. - - - --void clear() -+void clear() - - - Sequence -@@ -900,7 +900,7 @@ Erases the entire container. - - - --void resize(size_type n, charT c = charT()) -+void resize(size_type n, charT c = charT()) - - - Sequence -@@ -912,7 +912,7 @@ Appends characters, or erases characters - - - --basic_string& assign(const basic_string&) -+basic_string& assign(const basic_string&) - - - basic_string -@@ -924,7 +924,7 @@ Synonym for operator= - - - --basic_string& assign(const basic_string& s, -+basic_string& assign(const basic_string& s, - size_type pos, size_type n) - - -@@ -937,7 +937,7 @@ Assigns a substring of s to - - --basic_string& assign(const charT* s, size_type n) -+basic_string& assign(const charT* s, size_type n) - - - basic_string -@@ -948,7 +948,7 @@ Assigns the first n characters - - - --basic_string& assign(const charT* s) -+basic_string& assign(const charT* s) - - - basic_string -@@ -959,7 +959,7 @@ Assigns a null-terminated array of chara - - - --basic_string& assign(size_type n, charT c) -+basic_string& assign(size_type n, charT c) - - - Sequence -@@ -972,7 +972,7 @@ Erases the existing characters and repla - - - template <class InputIterator> --basic_string& assign(InputIterator first, InputIterator last) -+basic_string& assign(InputIterator first, InputIterator last) - - - -@@ -985,7 +985,7 @@ Erases the existing characters and repla - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - const basic_string& s) - - -@@ -999,7 +999,7 @@ Replaces a substring of *this w - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - const basic_string& s, - size_type pos1, size_type n1) - -@@ -1014,7 +1014,7 @@ Replaces a substring of *this w - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - const charT* s, size_type n1) - - -@@ -1028,7 +1028,7 @@ Replaces a substring of *this w - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - const charT* s) - - -@@ -1042,7 +1042,7 @@ Replaces a substring of *this w - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - size_type n1, charT c) - - -@@ -1056,7 +1056,7 @@ Replaces a substring of *this w - - - --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - const basic_string& s) - - -@@ -1070,7 +1070,7 @@ Replaces a substring of *this w - - - --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - const charT* s, size_type n) - - -@@ -1084,7 +1084,7 @@ Replaces a substring of *this w - - - --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - const charT* s) - - -@@ -1098,7 +1098,7 @@ Replaces a substring of *this w - - - --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - size_type n, charT c) - - -@@ -1113,7 +1113,7 @@ Replaces a substring of *this w - - - template <class InputIterator> --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - InputIterator f, InputIterator l) - - -@@ -1126,7 +1126,7 @@ Replaces a substring of *this w - - - --size_type copy(charT* buf, size_type n, size_type pos = 0) const -+size_type copy(charT* buf, size_type n, size_type pos = 0) const - - - basic_string -@@ -1137,7 +1137,7 @@ Copies a substring of *this to - - - --size_type find(const basic_string& s, size_type pos = 0) const -+size_type find(const basic_string& s, size_type pos = 0) const - - - basic_string -@@ -1149,7 +1149,7 @@ Searches for s as a substring o - - - --size_type find(const charT* s, size_type pos, size_type n) const -+size_type find(const charT* s, size_type pos, size_type n) const - - - basic_string -@@ -1161,7 +1161,7 @@ Searches for the first n charac - - - --size_type find(const charT* s, size_type pos = 0) const -+size_type find(const charT* s, size_type pos = 0) const - - - basic_string -@@ -1173,7 +1173,7 @@ Searches for a null-terminated character - - - --size_type find(charT c, size_type pos = 0) const -+size_type find(charT c, size_type pos = 0) const - - - basic_string -@@ -1184,7 +1184,7 @@ Searches for the character c, b - - - --size_type rfind(const basic_string& s, size_type pos = npos) const -+size_type rfind(const basic_string& s, size_type pos = npos) const - - - basic_string -@@ -1196,7 +1196,7 @@ Searches backward for s as a su - - - --size_type rfind(const charT* s, size_type pos, size_type n) const -+size_type rfind(const charT* s, size_type pos, size_type n) const - - - basic_string -@@ -1208,7 +1208,7 @@ Searches backward for the first n - - --size_type rfind(const charT* s, size_type pos = npos) const -+size_type rfind(const charT* s, size_type pos = npos) const - - - basic_string -@@ -1220,7 +1220,7 @@ Searches backward for a null-terminated - - - --size_type rfind(charT c, size_type pos = npos) const -+size_type rfind(charT c, size_type pos = npos) const - - - basic_string -@@ -1231,7 +1231,7 @@ Searches backward for the character - - - --size_type find_first_of(const basic_string& s, size_type pos = 0) const -+size_type find_first_of(const basic_string& s, size_type pos = 0) const - - - basic_string -@@ -1243,7 +1243,7 @@ Searches within *this, beginnin - - - --size_type find_first_of(const charT* s, size_type pos, size_type n) const -+size_type find_first_of(const charT* s, size_type pos, size_type n) const - - - basic_string -@@ -1255,7 +1255,7 @@ Searches within *this, beginnin - - - --size_type find_first_of(const charT* s, size_type pos = 0) const -+size_type find_first_of(const charT* s, size_type pos = 0) const - - - basic_string -@@ -1267,7 +1267,7 @@ Searches within *this, beginnin - - - --size_type find_first_of(charT c, size_type pos = 0) const -+size_type find_first_of(charT c, size_type pos = 0) const - - - basic_string -@@ -1279,7 +1279,7 @@ Searches within *this, beginnin - - - --size_type find_first_not_of(const basic_string& s, size_type pos = 0) const -+size_type find_first_not_of(const basic_string& s, size_type pos = 0) const - - - basic_string -@@ -1291,7 +1291,7 @@ Searches within *this, beginnin - - - --size_type find_first_not_of(const charT* s, size_type pos, size_type n) const -+size_type find_first_not_of(const charT* s, size_type pos, size_type n) const - - - basic_string -@@ -1303,7 +1303,7 @@ Searches within *this, beginnin - - - --size_type find_first_not_of(const charT* s, size_type pos = 0) const -+size_type find_first_not_of(const charT* s, size_type pos = 0) const - - - basic_string -@@ -1315,7 +1315,7 @@ Searches within *this, beginnin - - - --size_type find_first_not_of(charT c, size_type pos = 0) const -+size_type find_first_not_of(charT c, size_type pos = 0) const - - - basic_string -@@ -1327,7 +1327,7 @@ Searches within *this, beginnin - - - --size_type find_last_of(const basic_string& s, size_type pos = npos) const -+size_type find_last_of(const basic_string& s, size_type pos = npos) const - - - basic_string -@@ -1339,7 +1339,7 @@ Searches backward within *this, - - - --size_type find_last_of(const charT* s, size_type pos, size_type n) const -+size_type find_last_of(const charT* s, size_type pos, size_type n) const - - - basic_string -@@ -1351,7 +1351,7 @@ Searches backward within *this, - - - --size_type find_last_of(const charT* s, size_type pos = npos) const -+size_type find_last_of(const charT* s, size_type pos = npos) const - - - basic_string -@@ -1363,7 +1363,7 @@ Searches backward *this, beginn - - - --size_type find_last_of(charT c, size_type pos = npos) const -+size_type find_last_of(charT c, size_type pos = npos) const - - - basic_string -@@ -1375,7 +1375,7 @@ Searches backward *this, beginn - - - --size_type find_last_not_of(const basic_string& s, size_type pos = npos) const -+size_type find_last_not_of(const basic_string& s, size_type pos = npos) const - - - basic_string -@@ -1387,7 +1387,7 @@ Searches backward within *this, - - - --size_type find_last_not_of(const charT* s, size_type pos, size_type n) const -+size_type find_last_not_of(const charT* s, size_type pos, size_type n) const - - - basic_string -@@ -1399,7 +1399,7 @@ Searches backward within *this, - - - --size_type find_last_not_of(const charT* s, size_type pos = npos) const -+size_type find_last_not_of(const charT* s, size_type pos = npos) const - - - basic_string -@@ -1411,7 +1411,7 @@ Searches backward *this, beginn - - - --size_type find_last_not_of(charT c, size_type pos = npos) const -+size_type find_last_not_of(charT c, size_type pos = npos) const - - - basic_string -@@ -1423,7 +1423,7 @@ Searches backward *this, beginn - - - --basic_string substr(size_type pos = 0, size_type n = npos) const -+basic_string substr(size_type pos = 0, size_type n = npos) const - - - basic_string -@@ -1434,7 +1434,7 @@ Returns a substring of *this. - - - --int compare(const basic_string& s) const -+int compare(const basic_string& s) const - - - basic_string -@@ -1445,7 +1445,7 @@ Three-way lexicographical comparison of - - - --int compare(size_type pos, size_type n, const basic_string& s) const -+int compare(size_type pos, size_type n, const basic_string& s) const - - - basic_string -@@ -1456,7 +1456,7 @@ Three-way lexicographical comparison of - - - --int compare(size_type pos, size_type n, const basic_string& s, size_type pos1, size_type n1) const -+int compare(size_type pos, size_type n, const basic_string& s, size_type pos1, size_type n1) const - - - basic_string -@@ -1467,7 +1467,7 @@ Three-way lexicographical comparison of - - - --int compare(const charT* s) const -+int compare(const charT* s) const - - - basic_string -@@ -1478,7 +1478,7 @@ Three-way lexicographical comparison of - - - --int compare(size_type pos, size_type n, const charT* s, size_type len = npos) const -+int compare(size_type pos, size_type n, const charT* s, size_type len = npos) const - - - basic_string -@@ -1493,7 +1493,7 @@ Three-way lexicographical comparison of - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(const basic_string<charT, traits, Alloc>& s1, -+operator+(const basic_string<charT, traits, Alloc>& s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1509,7 +1509,7 @@ String concatenation. A global function - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(const charT* s1, -+operator+(const charT* s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1525,7 +1525,7 @@ String concatenation. A global function - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(const basic_string<charT, traits, Alloc>& s1, -+operator+(const basic_string<charT, traits, Alloc>& s1, - const charT* s2) - - -@@ -1541,7 +1541,7 @@ String concatenation. A global function - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(charT c, -+operator+(charT c, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1557,7 +1557,7 @@ String concatenation. A global function - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(const basic_string<charT, traits, Alloc>& s1, -+operator+(const basic_string<charT, traits, Alloc>& s1, - charT c) - - -@@ -1572,7 +1572,7 @@ String concatenation. A global function - - - template <class charT, class traits, class Alloc> --bool operator==(const basic_string<charT, traits, Alloc>& s1, -+bool operator==(const basic_string<charT, traits, Alloc>& s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1587,7 +1587,7 @@ String equality. A global function, not - - - template <class charT, class traits, class Alloc> --bool operator==(const charT* s1, -+bool operator==(const charT* s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1602,7 +1602,7 @@ String equality. A global function, not - - - template <class charT, class traits, class Alloc> --bool operator==(const basic_string<charT, traits, Alloc>& s1, -+bool operator==(const basic_string<charT, traits, Alloc>& s1, - const charT* s2) - - -@@ -1617,7 +1617,7 @@ String equality. A global function, not - - - template <class charT, class traits, class Alloc> --bool operator!=(const basic_string<charT, traits, Alloc>& s1, -+bool operator!=(const basic_string<charT, traits, Alloc>& s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1632,7 +1632,7 @@ String inequality. A global function, n - - - template <class charT, class traits, class Alloc> --bool operator!=(const charT* s1, -+bool operator!=(const charT* s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1647,7 +1647,7 @@ String inequality. A global function, n - - - template <class charT, class traits, class Alloc> --bool operator!=(const basic_string<charT, traits, Alloc>& s1, -+bool operator!=(const basic_string<charT, traits, Alloc>& s1, - const charT* s2) - - -@@ -1662,7 +1662,7 @@ String inequality. A global function, n - - - template <class charT, class traits, class Alloc> --bool operator<(const basic_string<charT, traits, Alloc>& s1, -+bool operator<(const basic_string<charT, traits, Alloc>& s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1677,7 +1677,7 @@ String comparison. A global function, n - - - template <class charT, class traits, class Alloc> --bool operator<(const charT* s1, -+bool operator<(const charT* s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -1692,7 +1692,7 @@ String comparison. A global function, n - - - template <class charT, class traits, class Alloc> --bool operator<(const basic_string<charT, traits, Alloc>& s1, -+bool operator<(const basic_string<charT, traits, Alloc>& s1, - const charT* s2) - - -@@ -1707,7 +1707,7 @@ String comparison. A global function, n - - - template <class charT, class traits, class Alloc> --void swap(basic_string<charT, traits, Alloc>& s1, -+void swap(basic_string<charT, traits, Alloc>& s1, - basic_string<charT, traits, Alloc>& s2) - - -@@ -1723,7 +1723,7 @@ Swaps the contents of two strings. - - template <class charT, class traits, class Alloc> - basic_istream<charT, traits>& --operator>>(basic_istream<charT, traits>& is, -+operator>>(basic_istream<charT, traits>& is, - basic_string<charT, traits, Alloc>& s) - - -@@ -1739,7 +1739,7 @@ Reads s from the input stream < - - template <class charT, class traits, class Alloc> - basic_ostream<charT, traits>& --operator<<(basic_istream<charT, traits>& os, -+operator<<(basic_istream<charT, traits>& os, - const basic_string<charT, traits, Alloc>& s) - - -@@ -1755,7 +1755,7 @@ Writes s to the output stream < - - template <class charT, class traits, class Alloc> - basic_istream<charT, traits>& --getline(basic_istream<charT, traits>& is, -+getline(basic_istream<charT, traits>& is, - basic_string<charT, traits, Alloc>& s, - charT delim) - -@@ -1772,7 +1772,7 @@ Reads a string from the input stream - template <class charT, class traits, class Alloc> - basic_istream<charT, traits>& --getline(basic_istream<charT, traits>& is, -+getline(basic_istream<charT, traits>& is, - basic_string<charT, traits, Alloc>& s) - - -@@ -1808,7 +1808,7 @@ The largest possible value of type s - - - --size_type length() const -+size_type length() const - - - Equivalent to size(). -@@ -1816,7 +1816,7 @@ Equivalent to size(). - - - --size_type capacity() const -+size_type capacity() const - - - Number of elements for which memory has been allocated. That is, -@@ -1827,7 +1827,7 @@ Number of elements for which memory has - - - --const charT* c_str() const -+const charT* c_str() const - - - Returns a pointer to a null-terminated array of characters representing -@@ -1840,7 +1840,7 @@ Returns a pointer to a null-terminated a - - - --const charT* data() const -+const charT* data() const - - - Returns a pointer to an array of characters, not necessarily -@@ -1853,7 +1853,7 @@ Returns a pointer to an array of charact - - - --basic_string(const basic_string& s, size_type pos = 0, size_type n = npos) -+basic_string(const basic_string& s, size_type pos = 0, size_type n = npos) - - - Constructs a string from a substring of s. The substring begins at -@@ -1865,7 +1865,7 @@ Constructs a string from a substring of - - - --basic_string(const charT* s) -+basic_string(const charT* s) - - - Equivalent to basic_string(s, s + traits::length(s)). -@@ -1873,7 +1873,7 @@ Equivalent to basic_string(s, s + tr - - - --basic_string(const charT* s, size_type n) -+basic_string(const charT* s, size_type n) - - - Equivalent to basic_string(s, s + n). -@@ -1881,7 +1881,7 @@ Equivalent to basic_string(s, s + n) - - - --basic_string& operator=(const charT* s) -+basic_string& operator=(const charT* s) - - - Equivalent to operator=(basic_string(s)). -@@ -1889,7 +1889,7 @@ Equivalent to operator=(basic_string - - - --basic_string& operator=(charT c) -+basic_string& operator=(charT c) - - - Assigns to *this a string whose size is 1 and whose contents is -@@ -1898,7 +1898,7 @@ Assigns to *this a string whose - - - --void reserve(size_t n) -+void reserve(size_t n) - - - Requests that the string's capacity be changed; the postcondition -@@ -1913,7 +1913,7 @@ Requests that the string's capacity be c - - - --basic_string& insert(size_type pos, const basic_string& s) -+basic_string& insert(size_type pos, const basic_string& s) - - - If pos > size(), throws out_of_range. Otherwise, equivalent to -@@ -1923,7 +1923,7 @@ If pos > size(), throws - - - --basic_string& insert(size_type pos, -+basic_string& insert(size_type pos, - const basic_string& s, - size_type pos1, size_type n) - -@@ -1935,7 +1935,7 @@ If pos > size() or pos1 - - - --basic_string& insert(size_type pos, const charT* s) -+basic_string& insert(size_type pos, const charT* s) - - - If pos > size(), throws out_of_range. Otherwise, equivalent to -@@ -1944,7 +1944,7 @@ If pos > size(), throws - - - --basic_string& insert(size_type pos, const charT* s, size_type n) -+basic_string& insert(size_type pos, const charT* s, size_type n) - - - If pos > size(), throws out_of_range. Otherwise, equivalent to -@@ -1953,7 +1953,7 @@ If pos > size(), throws - - - --basic_string& insert(size_type pos, size_type n, charT c) -+basic_string& insert(size_type pos, size_type n, charT c) - - - If pos > size(), throws out_of_range. Otherwise, equivalent to -@@ -1962,7 +1962,7 @@ If pos > size(), throws - - - --basic_string& append(const basic_string& s) -+basic_string& append(const basic_string& s) - - - Equivalent to insert(end(), s.begin(), s.end()). -@@ -1971,7 +1971,7 @@ Equivalent to insert(end(), s.begin( - - - --basic_string& append(const basic_string& s, -+basic_string& append(const basic_string& s, - size_type pos, size_type n) - - -@@ -1982,7 +1982,7 @@ If pos > s.size(), throws - - --basic_string& append(const charT* s) -+basic_string& append(const charT* s) - - - Equivalent to insert(end(), s, s + traits::length(s)). -@@ -1990,7 +1990,7 @@ Equivalent to insert(end(), s, s + t - - - --basic_string& append(const charT* s, size_type n) -+basic_string& append(const charT* s, size_type n) - - - Equivalent to insert(end(), s, s + n). -@@ -1998,7 +1998,7 @@ Equivalent to insert(end(), s, s + n - - - --basic_string& append(size_type n, charT c) -+basic_string& append(size_type n, charT c) - - - Equivalent to insert(end(), n, c). -@@ -2008,7 +2008,7 @@ Equivalent to insert(end(), n, c) - - template <class InputIterator> --basic_string& append(InputIterator first, InputIterator last) -+basic_string& append(InputIterator first, InputIterator last) - - - -@@ -2017,7 +2017,7 @@ Equivalent to insert(end(), first, l - - - --void push_back(charT c) -+void push_back(charT c) - - - Equivalent to insert(end(), c) -@@ -2025,7 +2025,7 @@ Equivalent to insert(end(), c) - - - --basic_string& operator+=(const basic_string& s) -+basic_string& operator+=(const basic_string& s) - - - Equivalent to append(s). -@@ -2033,7 +2033,7 @@ Equivalent to append(s). - - - --basic_string& operator+=(const charT* s) -+basic_string& operator+=(const charT* s) - - - Equivalent to append(s) -@@ -2041,7 +2041,7 @@ Equivalent to append(s) - - - --basic_string& operator+=(charT c) -+basic_string& operator+=(charT c) - - - Equivalent to push_back(c) -@@ -2049,7 +2049,7 @@ Equivalent to push_back(c) - - - --basic_string& erase(size_type pos = 0, size_type n = npos) -+basic_string& erase(size_type pos = 0, size_type n = npos) - - - If pos > size(), throws out_of_range. Otherwise, equivalent to -@@ -2058,7 +2058,7 @@ If pos > size(), throws - - - --basic_string& assign(const basic_string& s) -+basic_string& assign(const basic_string& s) - - - Synonym for operator= -@@ -2067,7 +2067,7 @@ Synonym for operator= - - - --basic_string& assign(const basic_string& s, -+basic_string& assign(const basic_string& s, - size_type pos, size_type n) - - -@@ -2077,7 +2077,7 @@ Equivalent to (but probably faster than) - - - --basic_string& assign(const charT* s, size_type n) -+basic_string& assign(const charT* s, size_type n) - - - Equivalent to (but probably faster than) clear() followed by insert(0, s, n). -@@ -2085,7 +2085,7 @@ Equivalent to (but probably faster than) - - - --basic_string& assign(const charT* s) -+basic_string& assign(const charT* s) - - - Equivalent to (but probably faster than) clear() followed by insert(0, s). -@@ -2094,7 +2094,7 @@ Equivalent to (but probably faster than) - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - const basic_string& s) - - -@@ -2105,7 +2105,7 @@ Equivalent to erase(pos, n) fol - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - const basic_string& s, size_type pos1, size_type n1) - - -@@ -2116,7 +2116,7 @@ Equivalent to erase(pos, n) fol - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - const charT* s, size_type n1) - - -@@ -2127,7 +2127,7 @@ Equivalent to erase(pos, n) fol - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - const charT* s) - - -@@ -2138,7 +2138,7 @@ Equivalent to erase(pos, n) fol - - - --basic_string& replace(size_type pos, size_type n, -+basic_string& replace(size_type pos, size_type n, - size_type n1, charT c) - - -@@ -2149,7 +2149,7 @@ Equivalent to erase(pos, n) fol - - - --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - const basic_string& s) - - -@@ -2160,7 +2160,7 @@ Equivalent to insert(erase(first, la - - - --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - const charT* s, size_type n) - - -@@ -2171,7 +2171,7 @@ Equivalent to insert(erase(first, la - - - --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - const charT* s) - - -@@ -2182,7 +2182,7 @@ Equivalent to insert(erase(first, la - - - --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - size_type n, charT c) - - -@@ -2194,7 +2194,7 @@ Equivalent to insert(erase(first, la - - - template <class InputIterator> --basic_string& replace(iterator first, iterator last, -+basic_string& replace(iterator first, iterator last, - InputIterator f, InputIterator l) - - -@@ -2204,7 +2204,7 @@ Equivalent to insert(erase(first, la - - - --size_type copy(charT* buf, size_type n, size_type pos = 0) const -+size_type copy(charT* buf, size_type n, size_type pos = 0) const - - - Copies at most n characters from *this to a character array. -@@ -2217,7 +2217,7 @@ Copies at most n characters fro - - - --size_type find(const basic_string& s, size_type pos = 0) const -+size_type find(const basic_string& s, size_type pos = 0) const - - - Searches for s as a substring of *this, beginning at -@@ -2234,7 +2234,7 @@ Searches for s as a substring o - - - --size_type find(const charT* s, size_type pos, size_type n) const -+size_type find(const charT* s, size_type pos, size_type n) const - - - Searches for the first n characters of s as a substring of *this, beginning at -@@ -2244,7 +2244,7 @@ Searches for the first n charac - - - --size_type find(const charT* s, size_type pos = 0) const -+size_type find(const charT* s, size_type pos = 0) const - - - Searches for a null-terminated character array as a substring of *this, beginning at -@@ -2254,7 +2254,7 @@ Searches for a null-terminated character - - - --size_type find(charT c, size_type pos = 0) const -+size_type find(charT c, size_type pos = 0) const - - - Searches for the character c, beginning at character position pos. -@@ -2265,7 +2265,7 @@ Searches for the character c, b - - - --size_type rfind(const basic_string& s, size_type pos = npos) const -+size_type rfind(const basic_string& s, size_type pos = npos) const - - - Searches backward for s as a substring of *this. -@@ -2283,7 +2283,7 @@ Searches backward for s as a su - - - --size_type rfind(const charT* s, size_type pos, size_type n) const -+size_type rfind(const charT* s, size_type pos, size_type n) const - - - Searches backward for the first n characters of s as a substring of *this. -@@ -2292,7 +2292,7 @@ Searches backward for the first n - - --size_type rfind(const charT* s, size_type pos = npos) const -+size_type rfind(const charT* s, size_type pos = npos) const - - - Searches backward for a null-terminated character array as a substring of *this. -@@ -2301,7 +2301,7 @@ Searches backward for a null-terminated - - - --size_type rfind(charT c, size_type pos = npos) const -+size_type rfind(charT c, size_type pos = npos) const - - - Searches backward for the character c. That is, returns the largest -@@ -2312,7 +2312,7 @@ Searches backward for the character - - - --size_type find_first_of(const basic_string& s, size_type pos = 0) const -+size_type find_first_of(const basic_string& s, size_type pos = 0) const - - - Searches within *this, beginning at pos, for the first character -@@ -2328,7 +2328,7 @@ Searches within *this, beginnin - - - --size_type find_first_of(const charT* s, size_type pos, size_type n) const -+size_type find_first_of(const charT* s, size_type pos, size_type n) const - - - Searches within *this, beginning at pos, for the first character -@@ -2341,7 +2341,7 @@ Searches within *this, beginnin - - - --size_type find_first_of(const charT* s, size_type pos = 0) const -+size_type find_first_of(const charT* s, size_type pos = 0) const - - - Equivalent to find_first_of(s, pos, traits::length(s)). -@@ -2349,7 +2349,7 @@ Equivalent to find_first_of(s, pos, - - - --size_type find_first_of(charT c, size_type pos = 0) const -+size_type find_first_of(charT c, size_type pos = 0) const - - - Equivalent to find(c, pos). -@@ -2357,7 +2357,7 @@ Equivalent to find(c, pos). - - - --size_type find_first_not_of(const basic_string& s, size_type pos = 0) const -+size_type find_first_not_of(const basic_string& s, size_type pos = 0) const - - - Searches within *this, beginning at pos, for the first character -@@ -2370,7 +2370,7 @@ Searches within *this, beginnin - - - --size_type find_first_not_of(const charT* s, size_type pos, size_type n) const -+size_type find_first_not_of(const charT* s, size_type pos, size_type n) const - - - Searches within *this, beginning at pos, for the first character -@@ -2383,7 +2383,7 @@ Searches within *this, beginnin - - - --size_type find_first_not_of(const charT* s, size_type pos = 0) const -+size_type find_first_not_of(const charT* s, size_type pos = 0) const - - - Equivalent to find_first_not_of(s, pos, traits::length(s)). -@@ -2391,7 +2391,7 @@ Equivalent to find_first_not_of(s, p - - - --size_type find_first_not_of(charT c, size_type pos = 0) const -+size_type find_first_not_of(charT c, size_type pos = 0) const - - - Returns the smallest character position N -@@ -2402,7 +2402,7 @@ Returns the smallest character position - - - --size_type find_last_of(const basic_string& s, size_type pos = npos) const -+size_type find_last_of(const basic_string& s, size_type pos = npos) const - - - Searches backward within *this for the first character -@@ -2414,7 +2414,7 @@ Searches backward within *this - - - --size_type find_last_of(const charT* s, size_type pos, size_type n) const -+size_type find_last_of(const charT* s, size_type pos, size_type n) const - - - Searches backward within *this for the first character -@@ -2427,7 +2427,7 @@ Searches backward within *this - - - --size_type find_last_of(const charT* s, size_type pos = npos) const -+size_type find_last_of(const charT* s, size_type pos = npos) const - - - Equivalent to find_last_of(s, pos, traits::length(s)). -@@ -2435,7 +2435,7 @@ Equivalent to find_last_of(s, pos, t - - - --size_type find_last_of(charT c, size_type pos = npos) const -+size_type find_last_of(charT c, size_type pos = npos) const - - - Equivalent to rfind(c, pos). -@@ -2443,7 +2443,7 @@ Equivalent to rfind(c, pos). - - - --size_type find_last_not_of(const basic_string& s, size_type pos = npos) const -+size_type find_last_not_of(const basic_string& s, size_type pos = npos) const - - - Searches backward within *this for the first character -@@ -2456,7 +2456,7 @@ Searches backward within *this - - - --size_type find_last_not_of(const charT* s, size_type pos, size_type n) const -+size_type find_last_not_of(const charT* s, size_type pos, size_type n) const - - - Searches backward within *this for the first character -@@ -2469,7 +2469,7 @@ Searches backward within *this - - - --size_type find_last_not_of(const charT* s, size_type pos = npos) const -+size_type find_last_not_of(const charT* s, size_type pos = npos) const - - - Equivalent to find_last_of(s, pos, traits::length(s)). -@@ -2477,7 +2477,7 @@ Equivalent to find_last_of(s, pos, t - - - --size_type find_last_not_of(charT c, size_type pos = npos) const -+size_type find_last_not_of(charT c, size_type pos = npos) const - - - Searches backward *this for the first character -@@ -2488,7 +2488,7 @@ Searches backward *this for the - - - --basic_string substr(size_type pos = 0, size_type n = npos) const -+basic_string substr(size_type pos = 0, size_type n = npos) const - - - Equivalent to basic_string(*this, pos, n). -@@ -2496,7 +2496,7 @@ Equivalent to basic_string(*this, po - - - --int compare(const basic_string& s) const -+int compare(const basic_string& s) const - - - Three-way lexicographical comparison of s and *this, much like -@@ -2508,7 +2508,7 @@ Three-way lexicographical comparison of - - - --int compare(size_type pos, size_type n, const basic_string& s) const -+int compare(size_type pos, size_type n, const basic_string& s) const - - - Three-way lexicographical comparison of s and a substring of *this. -@@ -2517,7 +2517,7 @@ Three-way lexicographical comparison of - - - --int compare(size_type pos, size_type n, const basic_string& s, size_type pos1, size_type n1) const -+int compare(size_type pos, size_type n, const basic_string& s, size_type pos1, size_type n1) const - - - Three-way lexicographical comparison of a substring of s and a substring of *this. -@@ -2526,7 +2526,7 @@ Three-way lexicographical comparison of - - - --int compare(const charT* s) const -+int compare(const charT* s) const - - - Three-way lexicographical comparison of s and *this. -@@ -2535,7 +2535,7 @@ Three-way lexicographical comparison of - - - --int compare(size_type pos, size_type n, const charT* s, size_type len = npos) const -+int compare(size_type pos, size_type n, const charT* s, size_type len = npos) const - - - Three-way lexicographical comparison of the first min(len, traits::length(s) -@@ -2548,7 +2548,7 @@ Three-way lexicographical comparison of - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(const basic_string<charT, traits, Alloc>& s1, -+operator+(const basic_string<charT, traits, Alloc>& s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -2562,7 +2562,7 @@ String concatenation. Equivalent to cre - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(const charT* s1, -+operator+(const charT* s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -2577,7 +2577,7 @@ String concatenation. - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(const basic_string<charT, traits, Alloc>& s1, -+operator+(const basic_string<charT, traits, Alloc>& s1, - const charT* s2) - - -@@ -2591,7 +2591,7 @@ String concatenation. Equivalent to cre - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(charT c, -+operator+(charT c, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -2606,7 +2606,7 @@ String concatenation. Equivalent to cre - - template <class charT, class traits, class Alloc> - basic_string<charT, traits, Alloc> --operator+(const basic_string<charT, traits, Alloc>& s1, -+operator+(const basic_string<charT, traits, Alloc>& s1, - charT c) - - -@@ -2620,7 +2620,7 @@ String concatenation. Equivalent to cre - - - template <class charT, class traits, class Alloc> --bool operator==(const charT* s1, -+bool operator==(const charT* s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -2633,7 +2633,7 @@ String equality. Equivalent to - - - template <class charT, class traits, class Alloc> --bool operator==(const basic_string<charT, traits, Alloc>& s1, -+bool operator==(const basic_string<charT, traits, Alloc>& s1, - const charT* s2) - - -@@ -2645,7 +2645,7 @@ String equality. Equivalent to basi - - - template <class charT, class traits, class Alloc> --bool operator!=(const charT* s1, -+bool operator!=(const charT* s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -2657,7 +2657,7 @@ String inequality. Equivalent to ba - - - template <class charT, class traits, class Alloc> --bool operator!=(const basic_string<charT, traits, Alloc>& s1, -+bool operator!=(const basic_string<charT, traits, Alloc>& s1, - const charT* s2) - - -@@ -2669,7 +2669,7 @@ String inequality. Equivalent to !( - - - template <class charT, class traits, class Alloc> --bool operator<(const charT* s1, -+bool operator<(const charT* s1, - const basic_string<charT, traits, Alloc>& s2) - - -@@ -2681,7 +2681,7 @@ String comparison. Equivalent to !( - - - template <class charT, class traits, class Alloc> --bool operator<(const basic_string<charT, traits, Alloc>& s1, -+bool operator<(const basic_string<charT, traits, Alloc>& s1, - const charT* s2) - - -@@ -2694,7 +2694,7 @@ String comparison. Equivalent to !( - - template <class charT, class traits, class Alloc> - basic_istream<charT, traits>& --operator>>(basic_istream<charT, traits>& is, -+operator>>(basic_istream<charT, traits>& is, - basic_string<charT, traits, Alloc>& s) - - -@@ -2713,7 +2713,7 @@ Reads s from the input stream < - - template <class charT, class traits, class Alloc> - basic_ostream<charT, traits>& --operator>>(basic_istream<charT, traits>& is, -+operator>>(basic_istream<charT, traits>& is, - const basic_string<charT, traits, Alloc>& s) - - -@@ -2728,7 +2728,7 @@ Writes s to the output stream < - - template <class charT, class traits, class Alloc> - basic_istream<charT, traits>& --getline(basic_istream<charT, traits>& is, -+getline(basic_istream<charT, traits>& is, - basic_string<charT, traits, Alloc>& s, - charT delim) - -@@ -2748,7 +2748,7 @@ Replaces the contents of s with - - template <class charT, class traits, class Alloc> - basic_istream<charT, traits>& --getline(basic_istream<charT, traits>& is, -+getline(basic_istream<charT, traits>& is, - basic_string<charT, traits, Alloc>& s) - - ---- stl-manual-3.30.orig/raw_storage_iterator.html -+++ stl-manual-3.30/raw_storage_iterator.html -@@ -151,7 +151,7 @@ Description - - - --raw_storage_iterator(ForwardIterator x) -+raw_storage_iterator(ForwardIterator x) - - - raw_storage_iterator -@@ -162,7 +162,7 @@ See below. - - - --raw_storage_iterator(const raw_storage_iterator&) -+raw_storage_iterator(const raw_storage_iterator&) - - - trivial iterator -@@ -173,7 +173,7 @@ The copy constructor - - - --raw_storage_iterator& operator=(const raw_storage_iterator&) -+raw_storage_iterator& operator=(const raw_storage_iterator&) - - - trivial iterator -@@ -184,7 +184,7 @@ The assignment operator - - - --raw_storage_iterator& operator*() -+raw_storage_iterator& operator*() - - - Output Iterator -@@ -195,7 +195,7 @@ Used to implement the Output Iterator -@@ -206,7 +206,7 @@ Used to implement the Output Iterator -@@ -217,7 +217,7 @@ Preincrement. - - - --raw_storage_iterator& operator++(int) -+raw_storage_iterator& operator++(int) - - - Output Iterator -@@ -228,7 +228,7 @@ Postincrement. - - - --output_iterator_tag iterator_category(const raw_storage_iterator&) -+output_iterator_tag iterator_category(const raw_storage_iterator&) - - - iterator tags -@@ -254,7 +254,7 @@ Description - - - --raw_storage_iterator(ForwardIterator i) -+raw_storage_iterator(ForwardIterator i) - - - Creates a raw_storage_iterator whose underlying iterator is i. -@@ -262,7 +262,7 @@ Creates a raw_storage_iterator - - - --raw_storage_iterator& operator=(const T& val) -+raw_storage_iterator& operator=(const T& val) - - - Constructs an object of ForwardIterator's value type at the ---- stl-manual-3.30.orig/hash_multiset.html -+++ stl-manual-3.30/hash_multiset.html -@@ -315,13 +315,13 @@ Iterator used to iterate through a h - Container - - --Const iterator used to iterate through a hash_multiset. (Iterator and -+Const iterator used to iterate through a hash_multiset. (Iterator and - const_iterator are the same type.) - - - - --iterator begin() const -+iterator begin() const - - - Container -@@ -332,7 +332,7 @@ Returns an iterator pointing to - - - --iterator end() const -+iterator end() const - - - Container -@@ -343,7 +343,7 @@ Returns an iterator pointing to - - - --size_type size() const -+size_type size() const - - - Container -@@ -354,7 +354,7 @@ Returns the size of the hash_multise - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -365,7 +365,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -376,7 +376,7 @@ Returns the largest possible size of the - - - --size_type bucket_count() const -+size_type bucket_count() const - - - Hashed Associative Container -@@ -387,7 +387,7 @@ Returns the number of buckets used by th - - - --void resize(size_type n) -+void resize(size_type n) - - - Hashed Associative Container -@@ -398,7 +398,7 @@ Increases the bucket count to at least < - - - --hasher hash_funct() const -+hasher hash_funct() const - - - Hashed Associative Container -@@ -409,7 +409,7 @@ Returns the hasher object used - - - --key_equal key_eq() const -+key_equal key_eq() const - - - Hashed Associative Container -@@ -420,7 +420,7 @@ Returns the key_equal object us - - - --hash_multiset() -+hash_multiset() - - - Container -@@ -431,7 +431,7 @@ Creates an empty hash_multiset. - - - --hash_multiset(size_type n) -+hash_multiset(size_type n) - - - Hashed Associative Container -@@ -443,7 +443,7 @@ Creates an empty hash_multiset - - - --hash_multiset(size_type n, -+hash_multiset(size_type n, - const hasher& h) - - -@@ -458,7 +458,7 @@ Creates an empty hash_multiset - - - --hash_multiset(size_type n, -+hash_multiset(size_type n, - const hasher& h, - const key_equal& k) - -@@ -475,7 +475,7 @@ Creates an empty hash_multiset - - - template <class InputIterator> --hash_multiset(InputIterator, InputIterator) -+hash_multiset(InputIterator, InputIterator) - [1] - - -@@ -490,7 +490,7 @@ Creates a hash_multiset with a copy of a - - - template <class InputIterator> --hash_multiset(InputIterator, InputIterator, -+hash_multiset(InputIterator, InputIterator, - size_type n) - [1] - -@@ -507,7 +507,7 @@ Creates a hash_multiset with a copy of a - - - template <class InputIterator> --hash_multiset(InputIterator, InputIterator, -+hash_multiset(InputIterator, InputIterator, - size_type n, const hasher& h) - [1] - -@@ -524,7 +524,7 @@ Creates a hash_multiset with a copy of a - - - template <class InputIterator> --hash_multiset(InputIterator, InputIterator, -+hash_multiset(InputIterator, InputIterator, - size_type n, const hasher& h, - const key_equal& k) - [1] -@@ -541,7 +541,7 @@ Creates a hash_multiset with a copy of a - - - --hash_multiset(const hash_multiset&) -+hash_multiset(const hash_multiset&) - - - Container -@@ -552,7 +552,7 @@ The copy constructor. - - - --hash_multiset& operator=(const hash_multiset&) -+hash_multiset& operator=(const hash_multiset&) - - - Container -@@ -563,7 +563,7 @@ The assignment operator - - - --void swap(hash_multiset&) -+void swap(hash_multiset&) - - - Container -@@ -574,7 +574,7 @@ Swaps the contents of two hash_multisets - - - --iterator insert(const value_type& x) -+iterator insert(const value_type& x) - - - Multiple Associative Container -@@ -587,7 +587,7 @@ Inserts x into the hash_mul - - - template <class InputIterator> --void insert(InputIterator, InputIterator) -+void insert(InputIterator, InputIterator) - [1] - - -@@ -600,7 +600,7 @@ Inserts a range into the hash_multis - - - --void erase(iterator pos) -+void erase(iterator pos) - - - Associative Container -@@ -611,7 +611,7 @@ Erases the element pointed to by pos - - - --size_type erase(const key_type& k) -+size_type erase(const key_type& k) - - - Associative Container -@@ -622,7 +622,7 @@ Erases the element whose key is k - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Associative Container -@@ -633,7 +633,7 @@ Erases all elements in a range. - - - --void clear() -+void clear() - - - Associative Container -@@ -644,7 +644,7 @@ Erases all of the elements. - - - --iterator find(const key_type& k) const -+iterator find(const key_type& k) const - - - Associative Container -@@ -655,7 +655,7 @@ Finds an element whose key is k - - - --size_type count(const key_type& k) const -+size_type count(const key_type& k) const - - - Associative Container -@@ -668,7 +668,7 @@ Counts the number of elements whose key - - - pair<iterator, iterator> --equal_range(const key_type& k) const -+equal_range(const key_type& k) const - - - -@@ -681,7 +681,7 @@ Finds a range containing all elements wh - - - --bool operator==(const hash_multiset&, -+bool operator==(const hash_multiset&, - const hash_multiset&) - - ---- stl-manual-3.30.orig/ostream_iterator.html -+++ stl-manual-3.30/ostream_iterator.html -@@ -111,7 +111,7 @@ Description - - - --ostream_iterator(ostream&) -+ostream_iterator(ostream&) - - - ostream_iterator -@@ -122,7 +122,7 @@ See below. - - - --ostream_iterator(ostream&, const char* s) -+ostream_iterator(ostream&, const char* s) - - - ostream_iterator -@@ -133,7 +133,7 @@ See below. - - - --ostream_iterator(const ostream_iterator&) -+ostream_iterator(const ostream_iterator&) - - - Output Iterator -@@ -144,7 +144,7 @@ The copy constructor - - - --ostream_iterator& operator=(const ostream_iterator&) -+ostream_iterator& operator=(const ostream_iterator&) - - - Output Iterator -@@ -155,7 +155,7 @@ The assignment operator - - - --ostream_iterator& operator=(const T&) -+ostream_iterator& operator=(const T&) - - - Output Iterator -@@ -167,7 +167,7 @@ Used to implement the Output Iterator -@@ -179,7 +179,7 @@ Used to implement the Output Iterator -@@ -190,7 +190,7 @@ Preincrement - - - --ostream_iterator& operator++(int) -+ostream_iterator& operator++(int) - - - Output Iterator -@@ -201,7 +201,7 @@ Postincrement - - - --output_iterator_tag iterator_category(const ostream_iterator&) -+output_iterator_tag iterator_category(const ostream_iterator&) - - - iterator tags -@@ -226,7 +226,7 @@ Description - - - --ostream_iterator(ostream& s) -+ostream_iterator(ostream& s) - - - Creates an ostream_iterator such that assignment of t through it -@@ -235,7 +235,7 @@ Creates an ostream_iterator suc - - - --ostream_iterator(ostream& s, const char* delim) -+ostream_iterator(ostream& s, const char* delim) - - - Creates an ostream_iterator such that assignment of t through it ---- stl-manual-3.30.orig/not_equal_to.html -+++ stl-manual-3.30/not_equal_to.html -@@ -144,7 +144,7 @@ The type of the result: bool - - - --not_equal_to() -+not_equal_to() - - - DefaultConstructible -@@ -155,7 +155,7 @@ The default constructor. - - - --bool operator()(const T& x, const T& y) -+bool operator()(const T& x, const T& y) - - - Binary Function ---- stl-manual-3.30.orig/Rope.html -+++ stl-manual-3.30/Rope.html -@@ -346,7 +346,7 @@ Const Sequence -@@ -380,7 +380,7 @@ Creates a rope with a copy of a - - - --rope(const iterator& f, const iterator& l) -+rope(const iterator& f, const iterator& l) - - - Sequence -@@ -391,7 +391,7 @@ Creates a rope with a copy of a - - - --rope(const charT* f, const charT* l) -+rope(const charT* f, const charT* l) - - - Sequence -@@ -402,7 +402,7 @@ Creates a rope with a copy of a - - - --rope(charT c) -+rope(charT c) - - - rope. -@@ -413,7 +413,7 @@ Single-character constructor. - - - --rope() -+rope() - - - Container -@@ -424,7 +424,7 @@ Default constructor. - - - --rope(char_producer<charT>*, size_t, bool) -+rope(char_producer<charT>*, size_t, bool) - - - rope -@@ -435,7 +435,7 @@ See below. - - - --rope(const rope& x) -+rope(const rope& x) - - - Container -@@ -446,7 +446,7 @@ The copy constructor. - - - --~rope() -+~rope() - - - Container -@@ -457,7 +457,7 @@ The destructor. - - - --rope& operator=(const rope&x) -+rope& operator=(const rope&x) - - - Container -@@ -468,7 +468,7 @@ The assignment operator. - - - --void swap(rope& x) -+void swap(rope& x) - - - Container -@@ -479,7 +479,7 @@ Swaps the contents of two ropes - - - --size_type size() const -+size_type size() const - - - Container -@@ -490,7 +490,7 @@ Returns the size of the rope. - - - --size_type length() const -+size_type length() const - - - rope -@@ -501,7 +501,7 @@ Same as size - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -512,7 +512,7 @@ Size of longest rope guaranteed - - - --bool empty() const -+bool empty() const - - - Container -@@ -523,7 +523,7 @@ Equivalent to size() == 0. - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -534,7 +534,7 @@ Returns an const_iterator point - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -545,7 +545,7 @@ Returns an const_iterator point - - - --iterator mutable_begin() -+iterator mutable_begin() - - - rope -@@ -556,7 +556,7 @@ Returns an iterator pointing to - - - --iterator mutable_end() -+iterator mutable_end() - - - rope -@@ -567,7 +567,7 @@ Returns an iterator pointing to - - - --const_reverse_iterator rbegin() const -+const_reverse_iterator rbegin() const - - - Reversible Container -@@ -579,7 +579,7 @@ Returns a const_reverse_iterator - - --const_reverse_iterator rend() const -+const_reverse_iterator rend() const - - - Reversible Container -@@ -591,7 +591,7 @@ Returns a const_reverse_iterator - - --iterator mutable_rbegin() -+iterator mutable_rbegin() - - - rope -@@ -603,7 +603,7 @@ Returns a reverse_iterator poin - - - --iterator mutable_rend() -+iterator mutable_rend() - - - rope -@@ -615,7 +615,7 @@ Returns a reverse_iterator poin - - - --charT operator[](size_type n) const -+charT operator[](size_type n) const - - - Random Access Container -@@ -626,7 +626,7 @@ Returns the n'th element. - - - --charT at(size_type pos) const -+charT at(size_type pos) const - - - Random Access Container -@@ -637,7 +637,7 @@ Returns the n'th element. - - - --reference mutable_reference_at(size_type n) -+reference mutable_reference_at(size_type n) - - - rope -@@ -648,7 +648,7 @@ Returns a reference to the - - - --int compare(const rope&) const -+int compare(const rope&) const - - - rope. -@@ -659,7 +659,7 @@ Three-way comparison. See below. - - - --charT front() const -+charT front() const - - - Sequence -@@ -670,7 +670,7 @@ Returns the first element. - - - --charT back() const -+charT back() const - - - Back Insertion Sequence -@@ -681,7 +681,7 @@ Returns the last element. - - - --void push_front() -+void push_front() - - - Front Insertion Sequence -@@ -692,7 +692,7 @@ Inserts a new element at the front. - - - --void push_back(charT) -+void push_back(charT) - - - Back Insertion Sequence -@@ -703,7 +703,7 @@ Inserts a new element at the end. - - - --void pop_front() -+void pop_front() - - - Front Insertion Sequence -@@ -714,7 +714,7 @@ Removes the first element. - - - --void pop_back() -+void pop_back() - - - Back Insertion Sequence -@@ -725,7 +725,7 @@ Removes the last element. - - - --iterator insert(const iterator& p, const rope& x) -+iterator insert(const iterator& p, const rope& x) - - - rope -@@ -736,7 +736,7 @@ Inserts the contents of x befor - - - --iterator insert(const iterator& p, charT c) -+iterator insert(const iterator& p, charT c) - - - Sequence -@@ -747,7 +747,7 @@ Inserts c before p. - - - --iterator insert(const iterator& p) -+iterator insert(const iterator& p) - - - Sequence -@@ -758,7 +758,7 @@ Inserts charT() before p - - --iterator insert(const iterator& p, size_t n, charT c) -+iterator insert(const iterator& p, size_t n, charT c) - - - Sequence -@@ -769,7 +769,7 @@ Inserts n copies of c - - - --iterator insert(const iterator& p, const charT* s) -+iterator insert(const iterator& p, const charT* s) - - - rope -@@ -780,7 +780,7 @@ Inserts a C string before p. - - - --iterator insert(const iterator& p, const charT* s, size_t n) -+iterator insert(const iterator& p, const charT* s, size_t n) - - - rope -@@ -792,7 +792,7 @@ Inserts a (not necessarily null-terminat - - - --iterator insert(const iterator& p, const charT* f, const char* l) -+iterator insert(const iterator& p, const charT* f, const char* l) - - - Sequence -@@ -804,7 +804,7 @@ Inserts the range [f, l) before - - - --iterator insert(const iterator& p, -+iterator insert(const iterator& p, - const const_iterator& f, const const_iterator& l) - - -@@ -818,7 +818,7 @@ Inserts the range [f, l) before - - - --iterator insert(const iterator& p, -+iterator insert(const iterator& p, - const iterator& f, const iterator& l) - - -@@ -831,7 +831,7 @@ Inserts the range [f, l) before - - - --void insert(size_t i, const rope& x) -+void insert(size_t i, const rope& x) - - - rope -@@ -842,7 +842,7 @@ Inserts the contents of x befor - - - --void insert(size_t i, charT c) -+void insert(size_t i, charT c) - - - rope -@@ -853,7 +853,7 @@ Inserts the character c before - - - --void insert(size_t i) -+void insert(size_t i) - - - rope -@@ -864,7 +864,7 @@ Inserts the character charT() b - - - --void insert(size_t i, size_t n, charT c) -+void insert(size_t i, size_t n, charT c) - - - rope -@@ -875,7 +875,7 @@ Inserts n copies of c - - - --void insert(size_t i, const charT* s) -+void insert(size_t i, const charT* s) - - - rope -@@ -886,7 +886,7 @@ Inserts a C string before the i - - - --void insert(size_t i, const charT* s, size_t n) -+void insert(size_t i, const charT* s, size_t n) - - - rope -@@ -898,7 +898,7 @@ Inserts a (not necessarily null-terminat - - - --void insert(size_t i, const charT* f, const charT* l) -+void insert(size_t i, const charT* f, const charT* l) - - - rope -@@ -910,7 +910,7 @@ Inserts the range [f, l) before - - - --void insert(size_t i, -+void insert(size_t i, - const const_iterator& f, const const_iterator& l) - - -@@ -924,7 +924,7 @@ Inserts the range [f, l) before - - - --void insert(size_t i, -+void insert(size_t i, - const iterator& f, const iterator& l) - - -@@ -937,7 +937,7 @@ Inserts the range [f, l) before - - - --void erase(const iterator& p) -+void erase(const iterator& p) - - - Sequence -@@ -948,7 +948,7 @@ Erases the element pointed to by p - - --void erase(const iterator& f, const iterator& l) -+void erase(const iterator& f, const iterator& l) - - - Sequence -@@ -959,7 +959,7 @@ Erases the range [f, l). - - - --void erase(size_t i, size_t n) -+void erase(size_t i, size_t n) - - - rope -@@ -970,7 +970,7 @@ Erases n elements, starting wit - - - --append(const charT* s) -+append(const charT* s) - - - rope -@@ -981,7 +981,7 @@ Appends a C string. - - - --append(const charT* s, size_t) -+append(const charT* s, size_t) - - - rope -@@ -992,7 +992,7 @@ Appends a (not necessarily null-terminat - - - --append(const charT* f, const charT* l) -+append(const charT* f, const charT* l) - - - rope -@@ -1003,7 +1003,7 @@ Appends a range. - - - --append(charT c) -+append(charT c) - - - rope -@@ -1014,7 +1014,7 @@ Appends the character c. - - - --append() -+append() - - - rope -@@ -1025,7 +1025,7 @@ Appends the character charT(). - - - --append(size_t n, charT c) -+append(size_t n, charT c) - - - rope -@@ -1036,7 +1036,7 @@ Appends n copies of c. - - - --append(const rope& x) -+append(const rope& x) - - - rope -@@ -1047,7 +1047,7 @@ Appends the rope x. - - - --void replace(const iterator& f, const iterator& l, const rope&) -+void replace(const iterator& f, const iterator& l, const rope&) - - - rope -@@ -1058,7 +1058,7 @@ See below. - - - --void replace(const iterator& f, const iterator& l, charT) -+void replace(const iterator& f, const iterator& l, charT) - - - rope -@@ -1069,7 +1069,7 @@ See below. - - - --void replace(const iterator& f, const iterator& l, const charT* s) -+void replace(const iterator& f, const iterator& l, const charT* s) - - - rope -@@ -1081,7 +1081,7 @@ See below. - - - --void replace(const iterator& f, const iterator& l, -+void replace(const iterator& f, const iterator& l, - const charT* s, size_t n) - - -@@ -1095,7 +1095,7 @@ See below. - - - --void replace(const iterator& f1, const iterator& l1, -+void replace(const iterator& f1, const iterator& l1, - const charT* f2, const charT* l2) - - -@@ -1109,7 +1109,7 @@ See below. - - - --void replace(const iterator& f1, const iterator& l1, -+void replace(const iterator& f1, const iterator& l1, - const const_iterator& f2, const const_iterator& l2) - - -@@ -1123,7 +1123,7 @@ See below. - - - --void replace(const iterator& f1, const iterator& l1, -+void replace(const iterator& f1, const iterator& l1, - const iterator& f2, const iterator& l2) - - -@@ -1136,7 +1136,7 @@ See below. - - - --void replace(const iterator& p, const rope& x) -+void replace(const iterator& p, const rope& x) - - - rope -@@ -1147,7 +1147,7 @@ See below. - - - --void replace(const iterator& p, charT c) -+void replace(const iterator& p, charT c) - - - rope -@@ -1158,7 +1158,7 @@ See below. - - - --void replace(const iterator& p, const charT* s) -+void replace(const iterator& p, const charT* s) - - - rope -@@ -1169,7 +1169,7 @@ See below. - - - --void replace(const iterator& p, const charT* s, size_t n) -+void replace(const iterator& p, const charT* s, size_t n) - - - rope -@@ -1181,7 +1181,7 @@ See below. - - - --void replace(const iterator& p, -+void replace(const iterator& p, - const charT* f, const charT* l) - - -@@ -1195,7 +1195,7 @@ See below. - - - --void replace(const iterator& p, -+void replace(const iterator& p, - const_iterator f, const_iterator l) - - -@@ -1209,7 +1209,7 @@ See below. - - - --void replace(const iterator& p, -+void replace(const iterator& p, - iterator f, iterator l) - - -@@ -1222,7 +1222,7 @@ See below. - - - --void replace(size_t i, size_t n, const rope& x) -+void replace(size_t i, size_t n, const rope& x) - - - rope -@@ -1233,7 +1233,7 @@ See below. - - - --void replace(size_t i, size_t n, const charT* s, size_t n) -+void replace(size_t i, size_t n, const charT* s, size_t n) - - - rope -@@ -1244,7 +1244,7 @@ See below. - - - --void replace(size_t i, size_t n, charT c) -+void replace(size_t i, size_t n, charT c) - - - rope -@@ -1255,7 +1255,7 @@ See below. - - - --void replace(size_t i, size_t n, const charT* s) -+void replace(size_t i, size_t n, const charT* s) - - - rope -@@ -1267,7 +1267,7 @@ See below. - - - --void replace(size_t i, size_t n, -+void replace(size_t i, size_t n, - const charT* f, const charT* l) - - -@@ -1281,7 +1281,7 @@ See below. - - - --void replace(size_t i, size_t n, -+void replace(size_t i, size_t n, - const const_iterator& f, - const const_iterator& l) - -@@ -1296,7 +1296,7 @@ See below. - - - --void replace(size_t i, size_t n, -+void replace(size_t i, size_t n, - const iterator& f, - const iterator& l) - -@@ -1310,7 +1310,7 @@ See below. - - - --void replace(size_t i, charT c) -+void replace(size_t i, charT c) - - - rope -@@ -1321,7 +1321,7 @@ See below. - - - --void replace(size_t i, const rope& x) -+void replace(size_t i, const rope& x) - - - rope -@@ -1332,7 +1332,7 @@ See below. - - - --void replace(size_t i, const charT* s) -+void replace(size_t i, const charT* s) - - - rope -@@ -1343,7 +1343,7 @@ See below. - - - --void replace(size_t i, const charT* s, size_t n) -+void replace(size_t i, const charT* s, size_t n) - - - rope -@@ -1354,7 +1354,7 @@ See below. - - - --void replace(size_t i, const charT* f, const charT* l) -+void replace(size_t i, const charT* f, const charT* l) - - - rope -@@ -1366,7 +1366,7 @@ See below. - - - --void replace(size_t i, -+void replace(size_t i, - const const_iterator& f, const const_iterator& l) - - -@@ -1380,7 +1380,7 @@ See below. - - - --void replace(size_t i, -+void replace(size_t i, - const iterator& f, const iterator& l) - - -@@ -1393,7 +1393,7 @@ See below. - - - --rope substr(iterator f) const -+rope substr(iterator f) const - - - rope -@@ -1404,7 +1404,7 @@ See below. - - - --rope substr(const_iterator f) const -+rope substr(const_iterator f) const - - - rope -@@ -1415,7 +1415,7 @@ See below. - - - --rope substr(iterator f, iterator l) const -+rope substr(iterator f, iterator l) const - - - rope -@@ -1426,7 +1426,7 @@ See below. - - - --rope substr(const_iterator f, const_iterator l) const -+rope substr(const_iterator f, const_iterator l) const - - - rope -@@ -1437,7 +1437,7 @@ See below. - - - --rope substr(size_t i, size_t n = 1) const -+rope substr(size_t i, size_t n = 1) const - - - rope -@@ -1448,7 +1448,7 @@ See below. - - - --void copy(charT* buf) const -+void copy(charT* buf) const - - - rope -@@ -1460,7 +1460,7 @@ Copies a rope into an array of charT - - - --size_type copy(size_type pos, size_type n, -+size_type copy(size_type pos, size_type n, - charT* buf) - - -@@ -1473,7 +1473,7 @@ Copies a rope into an array of charT - - - --const charT* c_str() const -+const charT* c_str() const - - - rope -@@ -1484,7 +1484,7 @@ See below. - - - --void delete_c_str() -+void delete_c_str() - - - rope -@@ -1495,7 +1495,7 @@ See below. - - - --rope operator+(const rope& L, const rope&R) -+rope operator+(const rope& L, const rope&R) - - - rope -@@ -1507,7 +1507,7 @@ Concatenates L and R. - - - --rope& operator+=(rope& L, const rope& R) -+rope& operator+=(rope& L, const rope& R) - - - rope -@@ -1519,7 +1519,7 @@ Appends R to L. This - - - --rope operator+(const rope& L, const charT* s) -+rope operator+(const rope& L, const charT* s) - - - rope -@@ -1531,7 +1531,7 @@ Concatenates L and s. - - - --rope& operator+=(rope& L, const charT* s) -+rope& operator+=(rope& L, const charT* s) - - - rope -@@ -1543,7 +1543,7 @@ Appends s to L. This - - - --rope operator+(const rope& L, charT c) -+rope operator+(const rope& L, charT c) - - - rope -@@ -1555,7 +1555,7 @@ Concatenates L and c. - - - --rope& operator+=(rope& L, charT c) -+rope& operator+=(rope& L, charT c) - - - rope -@@ -1567,7 +1567,7 @@ Appends c to L. This - - - --bool operator<(const rope&, const rope&) -+bool operator<(const rope&, const rope&) - - - Forward Container -@@ -1579,7 +1579,7 @@ Lexicographical comparison. This is a g - - - --bool operator==(const rope&, const rope*) -+bool operator==(const rope&, const rope*) - - - Forward Container -@@ -1591,7 +1591,7 @@ Tests two ropes for equality. - - - --ostream& operator<<(ostream& os, rope x) -+ostream& operator<<(ostream& os, rope x) - - - rope -@@ -1616,7 +1616,7 @@ Description - - - --rope(const charT* s) -+rope(const charT* s) - - - Constructs a rope from a C string. The rope consists of the -@@ -1626,7 +1626,7 @@ Constructs a rope from a C stri - - - --rope(const charT* s, size_t n) -+rope(const charT* s, size_t n) - - - Constructs a rope from an array of charT. The rope consists of the -@@ -1636,7 +1636,7 @@ Constructs a rope from an array - - - --rope(charT c) -+rope(charT c) - - - Constructs a rope consisting of the single character c. -@@ -1644,7 +1644,7 @@ Constructs a rope consisting of the sing - - - --rope(char_producer<charT>* cp, size_t n, bool destroy) -+rope(char_producer<charT>* cp, size_t n, bool destroy) - - - Constructs a rope of size n, whose characters are computed as -@@ -1658,7 +1658,7 @@ Constructs a rope of size n, wh - - - --size_type length() const -+size_type length() const - - - Synonym for size -@@ -1666,7 +1666,7 @@ Synonym for size - - - --iterator mutable_begin() -+iterator mutable_begin() - - - Returns an iterator pointing to the beginning of the rope. -@@ -1676,7 +1676,7 @@ Returns an iterator pointing to - - - --iterator mutable_end() -+iterator mutable_end() - - - Returns an iterator pointing to the end of the rope. -@@ -1686,7 +1686,7 @@ Returns an iterator pointing to - - - --iterator mutable_rbegin() -+iterator mutable_rbegin() - - - Returns a reverse_iterator pointing to the beginning of the -@@ -1697,7 +1697,7 @@ Returns a reverse_iterator poin - - - --iterator mutable_rend() -+iterator mutable_rend() - - - Returns a reverse_iterator pointing to the end of the -@@ -1708,7 +1708,7 @@ Returns a reverse_iterator poin - - - --reference mutable_reference_at(size_type n) -+reference mutable_reference_at(size_type n) - - - Returns a reference to the nth element. This member function -@@ -1718,7 +1718,7 @@ Returns a reference to the - - - --int compare(const rope& x) -+int compare(const rope& x) - - - Three-way comparison, much like the function strcmp from the -@@ -1730,7 +1730,7 @@ Three-way comparison, much like the func - - - --iterator insert(const iterator& p, const rope& x) -+iterator insert(const iterator& p, const rope& x) - - - Inserts the contents of the rope x immediately before the -@@ -1739,7 +1739,7 @@ Inserts the contents of the rope - - --iterator insert(const iterator& p, const charT* s) -+iterator insert(const iterator& p, const charT* s) - - - Inserts a C string immediately before the position p. The -@@ -1750,7 +1750,7 @@ Inserts a C string immediately before th - - - --iterator insert(const iterator& p, const charT* s, size_t n) -+iterator insert(const iterator& p, const charT* s, size_t n) - - - Inserts an array of charT. The elements that are inserted -@@ -1760,7 +1760,7 @@ Inserts an array of charT. The - - - --void insert(size_t i, const rope& x) -+void insert(size_t i, const rope& x) - - - Inserts the contents of the rope x immediately before the ith -@@ -1769,7 +1769,7 @@ Inserts the contents of the rope - - --void insert(size_t i, size_t n, charT c) -+void insert(size_t i, size_t n, charT c) - - - Inserts n copies of c immediately before the ith element. -@@ -1777,7 +1777,7 @@ Inserts n copies of c - - - --void insert(size_t i, const charT* s) -+void insert(size_t i, const charT* s) - - - Inserts a C string immediately before the ith element. The -@@ -1788,7 +1788,7 @@ Inserts a C string immediately before th - - - --void insert(size_t i, const charT* s, size_t n) -+void insert(size_t i, const charT* s, size_t n) - - - Inserts an array of charT immediately before the ith element. The -@@ -1798,7 +1798,7 @@ Inserts an array of charT immed - - - --void insert(size_t i, charT c) -+void insert(size_t i, charT c) - - - Inserts the character c immediately before the ith element. -@@ -1806,7 +1806,7 @@ Inserts the character c immedia - - - --void insert(size_t i) -+void insert(size_t i) - - - Inserts the character charT() immediately before the ith element. -@@ -1814,7 +1814,7 @@ Inserts the character charT() i - - - --void insert(size_t i, const charT* f, const charT* l) -+void insert(size_t i, const charT* f, const charT* l) - - - Inserts the range [f, l) immediately before the ith element. -@@ -1823,7 +1823,7 @@ Inserts the range [f, l) immedi - - - --void insert(size_t i, -+void insert(size_t i, - const const_iterator& f, const const_iterator& l) - - -@@ -1834,7 +1834,7 @@ Inserts the range [f, l) immedi - - - --void insert(size_t i, -+void insert(size_t i, - const iterator& f, const iterator& l) - - -@@ -1844,7 +1844,7 @@ Inserts the range [f, l) immedi - - - --void erase(size_t i, size_t n) -+void erase(size_t i, size_t n) - - - Erases n elements, starting with the ith element. -@@ -1852,7 +1852,7 @@ Erases n elements, starting wit - - - --append(const charT* s) -+append(const charT* s) - - - Adds a C string to the end of the rope. The -@@ -1863,7 +1863,7 @@ Adds a C string to the end of the ro - - - --append(const charT* s, size_ nt) -+append(const charT* s, size_ nt) - - - Adds an array of charT to the end of the rope. The -@@ -1873,7 +1873,7 @@ Adds an array of charT to the e - - - --append(const charT* f, const charT* l) -+append(const charT* f, const charT* l) - - - Adds the elements in the range [f, l) to the end of the rope. -@@ -1881,7 +1881,7 @@ Adds the elements in the range [f, l - - - --append(charT c) -+append(charT c) - - - Adds the character c to the end of the rope. -@@ -1889,7 +1889,7 @@ Adds the character c to the end - - - --append() -+append() - - - Adds the character charT() to the end of the rope. -@@ -1897,7 +1897,7 @@ Adds the character charT() to t - - - --append(const rope& x) -+append(const rope& x) - - - Adds the contents of the rope x to the end of *this. -@@ -1905,7 +1905,7 @@ Adds the contents of the rope x - - - --append(size_t n, charT c) -+append(size_t n, charT c) - - - Adds n copies of c to the end of *this. -@@ -1913,7 +1913,7 @@ Adds n copies of c to - - - --void replace(const iterator& f, const iterator& l, const rope& x) -+void replace(const iterator& f, const iterator& l, const rope& x) - - - Replaces the elements in the range [f, l) with the elements in x. -@@ -1921,7 +1921,7 @@ Replaces the elements in the range [ - - - --void replace(const iterator& f, const iterator& l, charT c) -+void replace(const iterator& f, const iterator& l, charT c) - - - Replaces the elements in the range [f, l) with the single -@@ -1930,7 +1930,7 @@ Replaces the elements in the range [ - - - --void replace(const iterator& f, const iterator& l, const charT* s) -+void replace(const iterator& f, const iterator& l, const charT* s) - - - Replaces the elements in the range [f, l) with a C string: -@@ -1941,7 +1941,7 @@ Replaces the elements in the range [ - - - --void replace(const iterator& f, const iterator& l, -+void replace(const iterator& f, const iterator& l, - const charT* s, size_t n) - - -@@ -1953,7 +1953,7 @@ Replaces the elements in the range [ - - - --void replace(const iterator& f1, const iterator& l1, -+void replace(const iterator& f1, const iterator& l1, - const charT* f2, const charT* l2) - - -@@ -1965,7 +1965,7 @@ Replaces the elements in the range [ - - - --void replace(const iterator& f1, const iterator& l1, -+void replace(const iterator& f1, const iterator& l1, - const const_iterator& f2, const const_iterator& l2) - - -@@ -1977,7 +1977,7 @@ Replaces the elements in the range [ - - - --void replace(const iterator& f1, const iterator& l1, -+void replace(const iterator& f1, const iterator& l1, - const iterator& f2, const iterator& l2) - - -@@ -1988,7 +1988,7 @@ Replaces the elements in the range [ - - - --void replace(const iterator& p, const rope& x) -+void replace(const iterator& p, const rope& x) - - - Replaces the element pointed to by p with the elements in x. -@@ -1996,7 +1996,7 @@ Replaces the element pointed to by p - - - --void replace(const iterator& p, charT c) -+void replace(const iterator& p, charT c) - - - Replaces the element pointed to by p with the single character c. -@@ -2004,7 +2004,7 @@ Replaces the element pointed to by p - - - --void replace(const iterator& p, const charT* s) -+void replace(const iterator& p, const charT* s) - - - Replaces the element pointed to by p with a C string: -@@ -2014,7 +2014,7 @@ Replaces the element pointed to by p - - - --void replace(const iterator& p, const charT* s, size_t n) -+void replace(const iterator& p, const charT* s, size_t n) - - - Replaces the element pointed to by p with the elements -@@ -2024,7 +2024,7 @@ Replaces the element pointed to by p - - - --void replace(const iterator& p, -+void replace(const iterator& p, - const charT* f, const charT* l) - - -@@ -2036,7 +2036,7 @@ Replaces the element pointed to by p - - - --void replace(const iterator& p, -+void replace(const iterator& p, - const_iterator f, const_iterator l) - - -@@ -2048,7 +2048,7 @@ Replaces the element pointed to by p - - - --void replace(const iterator& p, -+void replace(const iterator& p, - iterator f, iterator l) - - -@@ -2059,7 +2059,7 @@ Replaces the element pointed to by p - - - --void replace(size_t i, size_t n, const rope& x) -+void replace(size_t i, size_t n, const rope& x) - - - Replaces the n elements beginning with the ith element -@@ -2068,7 +2068,7 @@ Replaces the n elements beginni - - - --void replace(size_t i, size_t n, charT c) -+void replace(size_t i, size_t n, charT c) - - - Replaces the n elements beginning with the ith element -@@ -2077,7 +2077,7 @@ Replaces the n elements beginni - - - --void replace(size_t i, size_t n, const charT* s) -+void replace(size_t i, size_t n, const charT* s) - - - Replaces the n elements beginning with the ith element -@@ -2087,7 +2087,7 @@ Replaces the n elements beginni - - - --void replace(size_t i, size_t n1, const charT* s, size_t n2) -+void replace(size_t i, size_t n1, const charT* s, size_t n2) - - - Replaces the n1 elements beginning with the ith element -@@ -2097,7 +2097,7 @@ Replaces the n1 elements beginn - - - --void replace(size_t i, size_t n, -+void replace(size_t i, size_t n, - const charT* f, const charT* l) - - -@@ -2109,7 +2109,7 @@ Replaces the n elements beginni - - - --void replace(size_t i, size_t n, -+void replace(size_t i, size_t n, - const const_iterator& f, - const const_iterator& l) - -@@ -2122,7 +2122,7 @@ Replaces the n elements beginni - - - --void replace(size_t i, size_t n, -+void replace(size_t i, size_t n, - const iterator& f, - const iterator& l) - -@@ -2134,7 +2134,7 @@ Replaces the n elements beginni - - - --void replace(size_t i, charT c) -+void replace(size_t i, charT c) - - - Replaces the ith element with the character c. -@@ -2142,7 +2142,7 @@ Replaces the ith element with t - - - --void replace(size_t i, const rope& x) -+void replace(size_t i, const rope& x) - - - Replaces the ith element with elements from the rope x. -@@ -2150,7 +2150,7 @@ Replaces the ith element with e - - - --void replace(size_t i, const charT* s) -+void replace(size_t i, const charT* s) - - - Replaces the ith element with a C string: the sequence of characters beginning with *s and up to, but -@@ -2159,7 +2159,7 @@ Replaces the ith element with a - - - --void replace(size_t i, const charT* s, size_t n) -+void replace(size_t i, const charT* s, size_t n) - - - Replaces the ith element with the elements in the range [s, s + n). -@@ -2167,7 +2167,7 @@ Replaces the ith element with t - - - --void replace(size_t i, const charT* f, const charT* l) -+void replace(size_t i, const charT* f, const charT* l) - - - Replaces the ith element with the range [f, l). -@@ -2176,7 +2176,7 @@ Replaces the ith element with t - - - --void replace(size_t i, -+void replace(size_t i, - const const_iterator& f, const const_iterator& l) - - -@@ -2187,7 +2187,7 @@ Replaces the ith element with t - - - --void replace(size_t i, -+void replace(size_t i, - const iterator& f, const iterator& l) - - -@@ -2197,7 +2197,7 @@ Replaces the ith element with t - - - --rope substr(iterator f) const -+rope substr(iterator f) const - - - Returns a new rope with a single element, *f. [4] -@@ -2205,7 +2205,7 @@ Returns a new rope with a singl - - - --rope substr(const_iterator f) const -+rope substr(const_iterator f) const - - - Returns a new rope with a single element, *f. [4] -@@ -2213,7 +2213,7 @@ Returns a new rope with a singl - - - --rope substr(iterator f, iterator l) const -+rope substr(iterator f, iterator l) const - - - Returns a new rope that consists of the range [f, l). [4] -@@ -2221,7 +2221,7 @@ Returns a new rope that consist - - - --rope substr(const_iterator f, const_iterator l) const -+rope substr(const_iterator f, const_iterator l) const - - - Returns a new rope that consists of the range [f, l). [4] -@@ -2229,7 +2229,7 @@ Returns a new rope that consist - - - --rope substr(size_t i, size_t n = 1) const -+rope substr(size_t i, size_t n = 1) const - - - Returns a new rope whose elements are the n characters -@@ -2238,7 +2238,7 @@ Returns a new rope whose elemen - - - --void copy(charT* buf) const -+void copy(charT* buf) const - - - Copies the characters in a rope into buf. -@@ -2247,7 +2247,7 @@ Copies the characters in a rope - - - --size_type copy(size_type pos, size_type n, -+size_type copy(size_type pos, size_type n, - charT* buf) - - -@@ -2259,7 +2259,7 @@ Copies n characters, starting a - - - --const charT* c_str() const -+const charT* c_str() const - - - Returns a pointer to a null-terminated sequence of characters that -@@ -2271,7 +2271,7 @@ strings is slow: it is linear in the len - - - --void delete_c_str() -+void delete_c_str() - - - Reclaims the internal storage used by c_str. Note that this -@@ -2280,7 +2280,7 @@ Reclaims the internal storage used by - - --rope operator+(const rope& L, const rope& R) -+rope operator+(const rope& L, const rope& R) - - - Returns a new rope consisting of the concatenation of L and R. -@@ -2289,7 +2289,7 @@ Returns a new rope consisting o - - - --rope& operator+=(rope& L, const rope& R) -+rope& operator+=(rope& L, const rope& R) - - - Modifies L by appending R, and returns L. -@@ -2298,7 +2298,7 @@ Modifies L by appending R - - --rope operator+(const rope& L, const charT* s) -+rope operator+(const rope& L, const charT* s) - - - Returns a new rope consisting of the concatenation of L and all -@@ -2309,7 +2309,7 @@ Returns a new rope consisting o - - - --rope& operator+=(rope& L, const charT* s) -+rope& operator+=(rope& L, const charT* s) - - - Modifies L by appending the characters from s up to, but -@@ -2319,7 +2319,7 @@ Modifies L by appending the cha - - - --rope operator+(const rope& L, charT c) -+rope operator+(const rope& L, charT c) - - - Returns a new rope consisting of L with the character c -@@ -2328,7 +2328,7 @@ Returns a new rope consisting o - - - --rope& operator+=(rope& L, charT c) -+rope& operator+=(rope& L, charT c) - - - Modifies L by appending the character c. This is a global function, -@@ -2337,7 +2337,7 @@ Modifies L by appending the cha - - - --ostream& operator<<(ostream& os, rope x) -+ostream& operator<<(ostream& os, rope x) - - - Outputs x to the stream os. This is a global function, not ---- stl-manual-3.30.orig/binder2nd.html -+++ stl-manual-3.30/binder2nd.html -@@ -148,7 +148,7 @@ The type of the result: AdaptableBin - - - --result_type operator()(const argument_type& x) const -+result_type operator()(const argument_type& x) const - - - -@@ -162,7 +162,7 @@ arguments with which this binder1st< - - - --binder2nd(const AdaptableBinaryFunction& F, -+binder2nd(const AdaptableBinaryFunction& F, - AdaptableBinaryFunction::second_argument_type c) - - -@@ -178,7 +178,7 @@ See below - - template <class AdaptableBinaryFunction, class T> - binder2nd<AdaptableBinaryFunction> --bind2nd(const AdaptableBinaryFunction& F, const T& c); -+bind2nd(const AdaptableBinaryFunction& F, const T& c); - - - -@@ -206,7 +206,7 @@ Description - - - --binder2nd(const AdaptableBinaryFunction& F, -+binder2nd(const AdaptableBinaryFunction& F, - AdaptableBinaryFunction::second_argument_type c) - - -@@ -222,7 +222,7 @@ call F(x, c). - - template <class AdaptableBinaryFunction, class T> - binder2nd<AdaptableBinaryFunction> --bind2nd(const AdaptableBinaryFunction& F, const T& c); -+bind2nd(const AdaptableBinaryFunction& F, const T& c); - - - ---- stl-manual-3.30.orig/times.html -+++ stl-manual-3.30/times.html -@@ -155,7 +155,7 @@ The type of the result: T - - - --T operator()(const T& x, const T& y) -+T operator()(const T& x, const T& y) - - - Adaptable Binary Function -@@ -166,7 +166,7 @@ Function call operator. The return valu - - - --multiplies() [1] -+multiplies() [1] - - - Default Constructible ---- stl-manual-3.30.orig/back_insert_iterator.html -+++ stl-manual-3.30/back_insert_iterator.html -@@ -117,7 +117,7 @@ Description - - - --back_insert_iterator(BackInsertionSequence&) -+back_insert_iterator(BackInsertionSequence&) - - - back_insert_iterator -@@ -128,7 +128,7 @@ See below. - - - --back_insert_iterator(const back_insert_iterator&) -+back_insert_iterator(const back_insert_iterator&) - - - Trivial Iterator -@@ -141,7 +141,7 @@ The copy constructor - - - back_insert_iterator& --operator=(const back_insert_iterator&) -+operator=(const back_insert_iterator&) - - - -@@ -153,7 +153,7 @@ The assignment operator - - - --back_insert_iterator& operator*() -+back_insert_iterator& operator*() - - - Output Iterator -@@ -166,7 +166,7 @@ Used to implement the - - --back_insert_iterator& operator++() -+back_insert_iterator& operator++() - - - Output Iterator -@@ -189,7 +189,7 @@ Preincrement. - - - --back_insert_iterator& operator++(int) -+back_insert_iterator& operator++(int) - - - Output Iterator -@@ -202,7 +202,7 @@ Postincrement. - - - output_iterator_tag --iterator_category(const back_insert_iterator&) -+iterator_category(const back_insert_iterator&) - - - -@@ -218,7 +218,7 @@ Returns the iterator's category. - - template<class BackInsertionSequence> - back_insert_iterator<BackInsertionSequence> --back_inserter(BackInsertionSequence& S) -+back_inserter(BackInsertionSequence& S) - - - -@@ -244,7 +244,7 @@ Description - - - --back_insert_iterator(BackInsertionSequence& S) -+back_insert_iterator(BackInsertionSequence& S) - - - Constructs a back_insert_iterator that inserts objects -@@ -257,7 +257,7 @@ Constructs a back_insert_iterator - template<class BackInsertionSequence> - back_insert_iterator<BackInsertionSequence> --back_inserter(BackInsertionSequence& S); -+back_inserter(BackInsertionSequence& S); - - - ---- stl-manual-3.30.orig/equal_to.html -+++ stl-manual-3.30/equal_to.html -@@ -143,7 +143,7 @@ The type of the result: bool - - - --equal_to() -+equal_to() - - - DefaultConstructible -@@ -154,7 +154,7 @@ The default constructor. - - - --bool operator()(const T& x, const T& y) -+bool operator()(const T& x, const T& y) - - - Binary Function ---- stl-manual-3.30.orig/char_traits.html -+++ stl-manual-3.30/char_traits.html -@@ -163,7 +163,7 @@ Description - - - --static void assign(char_type& c1, const char_type& c2) -+static void assign(char_type& c1, const char_type& c2) - - - Character Traits -@@ -174,7 +174,7 @@ Assigns c2 to c1. - - - --static bool eq(const char_type& c1, const char_type& c2) -+static bool eq(const char_type& c1, const char_type& c2) - - - Character Traits -@@ -185,7 +185,7 @@ Character equality. - - - --static bool lt(const char_type& c1, const char_type& c2) -+static bool lt(const char_type& c1, const char_type& c2) - - - Character Traits -@@ -196,7 +196,7 @@ Returns true if c1 is - - - --static int compare(const char_type* p1, const char_type* p2, size_t n) -+static int compare(const char_type* p1, const char_type* p2, size_t n) - - - Character Traits -@@ -207,10 +207,10 @@ Three-way lexicographical comparison, mu - - - --Length -+static size_t length(const char* p) - - --static size_t length(const char* p) -+ Character Traits - - - Returns length of a null-terminated array of characters. -@@ -218,7 +218,7 @@ Returns length of a null-terminated arra - - - --static const char_type* find(const char_type* p, size_t n, const char_type& c) -+static const char_type* find(const char_type* p, size_t n, const char_type& c) - - - Character Traits -@@ -229,7 +229,7 @@ Finds c in [p, p+n), r - - - --static char_type* move(char_type* s, const char_type* p, size_t n) -+static char_type* move(char_type* s, const char_type* p, size_t n) - - - Character Traits -@@ -241,7 +241,7 @@ Copies characters from [p, p+n) - - - --static char_type* copy(char_type* s, const char_type* p, size_t n) -+static char_type* copy(char_type* s, const char_type* p, size_t n) - - - Character Traits -@@ -253,7 +253,7 @@ Copies characters from [p, p+n) - - - --static char_type* assign(char_type* s, size_t n, char_type c) -+static char_type* assign(char_type* s, size_t n, char_type c) - - - Character Traits -@@ -264,7 +264,7 @@ Assigns the value c to every el - - - --static int_type eof() -+static int_type eof() - - - Character Traits -@@ -275,7 +275,7 @@ Returns the value used as an EOF indicat - - - --static int_type not_eof(const int_type& c) -+static int_type not_eof(const int_type& c) - - - Character Traits -@@ -287,7 +287,7 @@ Returns a value that is not equal to - - --static char_type to_char_type(const int_type& c) -+static char_type to_char_type(const int_type& c) - - - Character Traits -@@ -299,7 +299,7 @@ Returns the char_type value cor - - - --static int_type to_int_type(const char_type& c) -+static int_type to_int_type(const char_type& c) - - - Character Traits -@@ -310,7 +310,7 @@ Returns a int_type representati - - - --static bool eq_int_type(cosnt int_type& c1, const int_type& c1) -+static bool eq_int_type(cosnt int_type& c1, const int_type& c1) - - - Character Traits ---- stl-manual-3.30.orig/stack.html -+++ stl-manual-3.30/stack.html -@@ -176,7 +176,7 @@ See below. - - - --stack() -+stack() - - - Default Constructible -@@ -187,7 +187,7 @@ The default constructor. Creates an emp - - - --stack(const stack&) -+stack(const stack&) - - - Assignable -@@ -198,7 +198,7 @@ The copy constructor. - - - --stack& operator=(const stack&) -+stack& operator=(const stack&) - - - Assignable -@@ -209,7 +209,7 @@ The assignment operator. - - - --bool empty() const -+bool empty() const - - - stack -@@ -220,7 +220,7 @@ See below. - - - --size_type size() const -+size_type size() const - - - stack -@@ -231,7 +231,7 @@ See below. - - - --value_type& top() -+value_type& top() - - - stack -@@ -242,7 +242,7 @@ See below. - - - --const value_type& top() const -+constvalue_type& top() const - - - stack -@@ -253,7 +253,7 @@ See below. - - - --void push(const value_type&) -+void push(const value_type&) - - - stack -@@ -264,7 +264,7 @@ See below. - - - --void pop() [3] -+void pop() [3] - - - stack -@@ -275,7 +275,7 @@ See below. - - - --bool operator==(const stack&, const stack&) -+bool operator==(const stack&, const stack&) - - - stack -@@ -286,7 +286,7 @@ See below. - - - --bool operator<(const stack&, const stack&) -+bool operator<(const stack&, const stack&) - - - stack -@@ -328,7 +328,7 @@ An unsigned integral type. This is the - - - --bool empty() const -+bool empty() const - - - Returns true if the stack contains no elements, and false -@@ -337,7 +337,7 @@ Returns true if the stack - - --size_type size() const -+size_type size() const - - - Returns the number of elements contained in the stack. -@@ -345,7 +345,7 @@ Returns the number of elements contained - - - --value_type& top() -+value_type& top() - - - Returns a mutable reference to the element at the top of the stack. -@@ -354,7 +354,7 @@ Returns a mutable reference to the eleme - - - --const value_type& top() const -+constvalue_type& top() const - - - Returns a const reference to the element at the top of the stack. -@@ -363,7 +363,7 @@ Returns a const reference to the element - - - --void push(const value_type& x) -+void push(const value_type& x) - - - Inserts x at the top of the stack. Postconditions: size() will -@@ -372,7 +372,7 @@ Inserts x at the top of the sta - - - --void pop() -+void pop() - - - Removes the element at the top of the stack. [3] Precondition: -@@ -382,7 +382,7 @@ Removes the element at the top of the st - - - --bool operator==(const stack&, const stack&) -+bool operator==(const stack&, const stack&) - - - Compares two stacks for equality. Two stacks are equal if they -@@ -392,7 +392,7 @@ Compares two stacks for equality. Two s - - - --bool operator<(const stack&, const stack&) -+bool operator<(const stack&, const stack&) - - - Lexicographical ordering of two stacks. ---- stl-manual-3.30.orig/plus.html -+++ stl-manual-3.30/plus.html -@@ -151,7 +151,7 @@ The type of the result: T - - - --T operator()(const T& x, const T& y) -+T operator()(const T& x, const T& y) - - - Adaptable Binary Function -@@ -162,7 +162,7 @@ Function call operator. The return valu - - - --plus() -+plus() - - - Default Constructible ---- stl-manual-3.30.orig/divides.html -+++ stl-manual-3.30/divides.html -@@ -151,7 +151,7 @@ The type of the result: T - - - --T operator()(const T& x, const T& y) -+T operator()(const T& x, const T& y) - - - Adaptable Binary Function -@@ -162,7 +162,7 @@ Function call operator. The return valu - - - --divides() -+divides() - - - Default Constructible ---- stl-manual-3.30.orig/Map.html -+++ stl-manual-3.30/Map.html -@@ -344,7 +344,7 @@ Const iterator used to iterate backwards - - - --iterator begin() -+iterator begin() - - - Container -@@ -355,7 +355,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -366,7 +366,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -377,7 +377,7 @@ Returns a const_iterator pointi - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -388,7 +388,7 @@ Returns a const_iterator pointi - - - --reverse_iterator rbegin() -+reverse_iterator rbegin() - - - Reversible Container -@@ -400,7 +400,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() -+reverse_iterator rend() - - - Reversible Container -@@ -412,7 +412,7 @@ Returns a reverse_iterator poin - - - --const_reverse_iterator rbegin() const -+const_reverse_iterator rbegin() const - - - Reversible Container -@@ -424,7 +424,7 @@ Returns a const_reverse_iterator - - --const_reverse_iterator rend() const -+const_reverse_iterator rend() const - - - Reversible Container -@@ -436,7 +436,7 @@ Returns a const_reverse_iterator - - --size_type size() const -+size_type size() const - - - Container -@@ -447,7 +447,7 @@ Returns the size of the map. - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -458,7 +458,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -469,7 +469,7 @@ Returns the largest possible size of the - - - --key_compare key_comp() const -+key_compare key_comp() const - - - Sorted Associative Container -@@ -480,7 +480,7 @@ Returns the key_compare object - - - --value_compare value_comp() const -+value_compare value_comp() const - - - Sorted Associative Container -@@ -491,7 +491,7 @@ Returns the value_compare objec - - - --map() -+map() - - - Container -@@ -502,7 +502,7 @@ Creates an empty map. - - - --map(const key_compare& comp) -+map(const key_compare& comp) - - - Sorted Associative Container -@@ -515,7 +515,7 @@ Creates an empty map, using - - template <class InputIterator> --map(InputIterator f, InputIterator l) -+map(InputIterator f, InputIterator l) - [2] - - -@@ -530,7 +530,7 @@ Creates a map with a copy of a range. - - - template <class InputIterator> --map(InputIterator f, InputIterator l, -+map(InputIterator f, InputIterator l, - const key_compare& comp) - [2] - -@@ -545,7 +545,7 @@ Creates a map with a copy of a range, us - - - --map(const map&) -+map(const map&) - - - Container -@@ -556,7 +556,7 @@ The copy constructor. - - - --map& operator=(const map&) -+map& operator=(const map&) - - - Container -@@ -567,7 +567,7 @@ The assignment operator - - - --void swap(map&) -+void swap(map&) - - - Container -@@ -580,7 +580,7 @@ Swaps the contents of two maps. - - - pair<iterator, bool> --insert(const value_type& x) -+insert(const value_type& x) - - - -@@ -593,7 +593,7 @@ Inserts x into the map - - - --iterator insert(iterator pos, -+iterator insert(iterator pos, - const value_type& x) - - -@@ -609,7 +609,7 @@ Inserts x into the map - - - template <class InputIterator> --void insert(InputIterator, InputIterator) -+void insert(InputIterator, InputIterator) - [2] - - -@@ -622,7 +622,7 @@ Inserts a range into the map. - - - --void erase(iterator pos) -+void erase(iterator pos) - - - Associative Container -@@ -633,7 +633,7 @@ Erases the element pointed to by pos - - - --size_type erase(const key_type& k) -+size_type erase(const key_type& k) - - - Associative Container -@@ -644,7 +644,7 @@ Erases the element whose key is k - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Associative Container -@@ -655,7 +655,7 @@ Erases all elements in a range. - - - --void clear() -+void clear() - - - Associative Container -@@ -666,7 +666,7 @@ Erases all of the elements. - - - --iterator find(const key_type& k) -+iterator find(const key_type& k) - - - Associative Container -@@ -677,7 +677,7 @@ Finds an element whose key is k - - - --const_iterator find(const key_type& k) const -+const_iterator find(const key_type& k) const - - - Associative Container -@@ -688,7 +688,7 @@ Finds an element whose key is k - - - --size_type count(const key_type& k) -+size_type count(const key_type& k) - - - Unique Associative Container -@@ -699,7 +699,7 @@ Counts the number of elements whose key - - - --iterator lower_bound(const key_type& k) -+iterator lower_bound(const key_type& k) - - - Sorted Associative Container -@@ -710,7 +710,7 @@ Finds the first element whose key is not - - - --const_iterator lower_bound(const key_type& k) const -+const_iterator lower_bound(const key_type& k) const - - - Sorted Associative Container -@@ -721,7 +721,7 @@ Finds the first element whose key is not - - - --iterator upper_bound(const key_type& k) -+iterator upper_bound(const key_type& k) - - - Sorted Associative Container -@@ -732,7 +732,7 @@ Finds the first element whose key greate - - - --const_iterator upper_bound(const key_type& k) const -+const_iterator upper_bound(const key_type& k) const - - - Sorted Associative Container -@@ -745,7 +745,7 @@ Finds the first element whose key greate - - - pair<iterator, iterator> --equal_range(const key_type& k) -+equal_range(const key_type& k) - - - -@@ -759,7 +759,7 @@ Finds a range containing all elements wh - - - pair<const_iterator, const_iterator> --equal_range(const key_type& k) const -+equal_range(const key_type& k) const - - - -@@ -773,7 +773,7 @@ Finds a range containing all elements wh - - - data_type& --operator[](const key_type& k) [3] -+operator[](const key_type& k) [3] - - - -@@ -786,7 +786,7 @@ See below. - - - --bool operator==(const map&, -+bool operator==(const map&, - const map&) - - -@@ -801,7 +801,7 @@ Tests two maps for equality. This is a - - - --bool operator<(const map&, -+bool operator<(const map&, - const map&) - - -@@ -831,7 +831,7 @@ Description - - - data_type& --operator[](const key_type& k) [3] -+operator[](const key_type& k) [3] - - - ---- stl-manual-3.30.orig/sequence_buffer.html -+++ stl-manual-3.30/sequence_buffer.html -@@ -182,7 +182,7 @@ The underlying container's value type. - - - --sequence_buffer(Container& C) -+sequence_buffer(Container& C) - - - sequence_buffer -@@ -193,7 +193,7 @@ Create a sequence_buffer whose - - - --sequence_buffer() -+sequence_buffer() - - - Default Constructible -@@ -204,7 +204,7 @@ The default constructor. The resulting - - - --sequence_buffer(const sequence_buffer&) -+sequence_buffer(const sequence_buffer&) - - - Assignable -@@ -215,7 +215,7 @@ Copy constructor. - - - --sequence_buffer& operator=(const sequence_buffer& s) -+sequence_buffer& operator=(const sequence_buffer& s) - - - Assignable -@@ -226,7 +226,7 @@ Assignment operator. - - - --sequence_buffer& operator=(sequence_buffer& s) -+sequence_buffer& operator=(sequence_buffer& s) - - - Assignable -@@ -237,7 +237,7 @@ Faster version of assignment operator. - - - --sequence_buffer& operator=(const value_type&) -+sequence_buffer& operator=(const value_type&) - - - Output Iterator -@@ -249,7 +249,7 @@ Used to implement the Output Iterator -@@ -261,7 +261,7 @@ Used to implement the Output Iterator -@@ -272,7 +272,7 @@ Preincrement - - - --sequence_buffer& operator++(int) -+sequence_buffer& operator++(int) - - - Output Iterator -@@ -283,7 +283,7 @@ Postincrement - - - --void flush() -+void flush() - - - sequence_buffer -@@ -294,18 +294,18 @@ Flush the buffer. - - - --void push_back(value_type) -+void push_back(value_type) - - - sequence_buffer - - --i.push_back(x) is equivalent to *i = x. -+i.push_back(x) is equivalent to *i = x. - - - - --void append(value_type* s, size_t len) -+void append(value_type* s, size_t len) - - - sequence_buffer -@@ -339,7 +339,7 @@ The underlying container's value type. - - - --sequence_buffer(Container& C) -+sequence_buffer(Container& C) - - - Create a sequence_buffer whose underlying container is C. -@@ -349,7 +349,7 @@ Create a sequence_buffer whose - - - --void flush() -+void flush() - - - Append all elements in the buffer to the underlying container, and -@@ -362,7 +362,7 @@ Append all elements in the buffer to the - - - --void push_back(value_type x) -+void push_back(value_type x) - - - Append x to the sequence_buffer. Note that this member function is -@@ -372,7 +372,7 @@ Append x to the sequence_bu - - - --void append(value_type* s, size_t len) -+void append(value_type* s, size_t len) - - - Append the range [s, s + len) to the sequence_buffer. Note ---- stl-manual-3.30.orig/set.html -+++ stl-manual-3.30/set.html -@@ -360,7 +360,7 @@ Const iterator used to iterate backwards - - - --iterator begin() const -+iterator begin() const - - - Container -@@ -371,7 +371,7 @@ Returns an iterator pointing to - - - --iterator end() const -+iterator end() const - - - Container -@@ -382,7 +382,7 @@ Returns an iterator pointing to - - - --reverse_iterator rbegin() const -+reverse_iterator rbegin() const - - - Reversible Container -@@ -394,7 +394,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() const -+reverse_iterator rend() const - - - Reversible Container -@@ -406,7 +406,7 @@ Returns a reverse_iterator poin - - - --size_type size() const -+size_type size() const - - - Container -@@ -417,7 +417,7 @@ Returns the size of the set. - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -428,7 +428,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -439,7 +439,7 @@ Returns the largest possible size of the - - - --key_compare key_comp() const -+key_compare key_comp() const - - - Sorted Associative Container -@@ -450,7 +450,7 @@ Returns the key_compare object - - - --value_compare value_comp() const -+value_compare value_comp() const - - - Sorted Associative Container -@@ -461,7 +461,7 @@ Returns the value_compare objec - - - --set() -+set() - - - Container -@@ -472,7 +472,7 @@ Creates an empty set. - - - --set(const key_compare& comp) -+set(const key_compare& comp) - - - Sorted Associative Container -@@ -485,7 +485,7 @@ Creates an empty set, using - - template <class InputIterator> --set(InputIterator f, InputIterator l) -+set(InputIterator f, InputIterator l) - [1] - - -@@ -500,7 +500,7 @@ Creates a set with a copy of a range. - - - template <class InputIterator> --set(InputIterator f, InputIterator l, -+set(InputIterator f, InputIterator l, - const key_compare& comp) - [1] - -@@ -515,7 +515,7 @@ Creates a set with a copy of a range, us - - - --set(const set&) -+set(const set&) - - - Container -@@ -526,7 +526,7 @@ The copy constructor. - - - --set& operator=(const set&) -+set& operator=(const set&) - - - Container -@@ -537,7 +537,7 @@ The assignment operator - - - --void swap(set&) -+void swap(set&) - - - Container -@@ -550,7 +550,7 @@ Swaps the contents of two sets. - - - pair<iterator, bool> --insert(const value_type& x) -+insert(const value_type& x) - - - -@@ -563,7 +563,7 @@ Inserts x into the set - - - --iterator insert(iterator pos, -+iterator insert(iterator pos, - const value_type& x) - - -@@ -579,7 +579,7 @@ Inserts x into the set - - - template <class InputIterator> --void insert(InputIterator, InputIterator) -+void insert(InputIterator, InputIterator) - [1] - - -@@ -592,7 +592,7 @@ Inserts a range into the set. - - - --void erase(iterator pos) -+void erase(iterator pos) - - - Associative Container -@@ -603,7 +603,7 @@ Erases the element pointed to by pos - - - --size_type erase(const key_type& k) -+size_type erase(const key_type& k) - - - Associative Container -@@ -614,7 +614,7 @@ Erases the element whose key is k - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Associative Container -@@ -625,7 +625,7 @@ Erases all elements in a range. - - - --void clear() -+void clear() - - - Associative Container -@@ -636,7 +636,7 @@ Erases all of the elements. - - - --iterator find(const key_type& k) const -+iterator find(const key_type& k) const - - - Associative Container -@@ -647,7 +647,7 @@ Finds an element whose key is k - - - --size_type count(const key_type& k) const -+size_type count(const key_type& k) const - - - Unique Associative Container -@@ -658,7 +658,7 @@ Counts the number of elements whose key - - - --iterator lower_bound(const key_type& k) const -+iterator lower_bound(const key_type& k) const - - - Sorted Associative Container -@@ -669,7 +669,7 @@ Finds the first element whose key is not - - - --iterator upper_bound(const key_type& k) const -+iterator upper_bound(const key_type& k) const - - - Sorted Associative Container -@@ -682,7 +682,7 @@ Finds the first element whose key greate - - - pair<iterator, iterator> --equal_range(const key_type& k) const -+equal_range(const key_type& k) const - - - -@@ -695,7 +695,7 @@ Finds a range containing all elements wh - - - --bool operator==(const set&, -+bool operator==(const set&, - const set&) - - -@@ -710,7 +710,7 @@ Tests two sets for equality. This is a - - - --bool operator<(const set&, -+bool operator<(const set&, - const set&) - - ---- stl-manual-3.30.orig/minus.html -+++ stl-manual-3.30/minus.html -@@ -151,7 +151,7 @@ The type of the result: T - - - --T operator()(const T& x, const T& y) -+T operator()(const T& x, const T& y) - - - Adaptable Binary Function -@@ -162,7 +162,7 @@ Function call operator. The return valu - - - --minus() -+minus() - - - Default Constructible ---- stl-manual-3.30.orig/unary_negate.html -+++ stl-manual-3.30/unary_negate.html -@@ -144,7 +144,7 @@ The type of the result: bool - - - --bool operator()(argument_type) -+bool operator()(argument_type) - - - Unary Function -@@ -156,7 +156,7 @@ Function call operator. - - - --unary_negate(const AdaptablePredicate& pred) -+unary_negate(const AdaptablePredicate& pred) - - - -@@ -171,7 +171,7 @@ See below. - - template <class AdaptablePredicate> - unary_negate<AdaptablePredicate> --not1(const AdaptablePredicate& pred); -+not1(const AdaptablePredicate& pred); - - - -@@ -199,7 +199,7 @@ Description - - - --unary_negate(const AdaptablePredicate& pred) -+unary_negate(const AdaptablePredicate& pred) - - - -@@ -212,12 +212,12 @@ whose underlying predicate is pred - template <class AdaptablePredicate> - unary_negate<AdaptablePredicate> --not1(const AdaptablePredicate& pred); -+not1(const AdaptablePredicate& pred); - - - - If p is of type AdaptablePredicate then --not1(p) is equivalent to unary_negate<AdaptablePredicate>(p), -+not1(p) is equivalent to unary_negate<AdaptablePredicate>(p), - but more convenient. This is a global function, not a member - function. - ---- stl-manual-3.30.orig/distance_type.html -+++ stl-manual-3.30/distance_type.html -@@ -50,18 +50,18 @@ - Distance_type is overloaded; it is in fact five different functions. - - template <class T, class Distance> --inline Distance* distance_type(const input_iterator<T, Distance>&); -+inline Distance* distance_type(const input_iterator<T, Distance>&); - - template <class T, class Distance> --inline Distance* distance_type(const forward_iterator<T, Distance>&); -+inline Distance* distance_type(const forward_iterator<T, Distance>&); - - template <class T, class Distance> --inline Distance* distance_type(const bidirectional_iterator<T, Distance>&); -+inline Distance* distance_type(const bidirectional_iterator<T, Distance>&); - - template <class T, class Distance> --inline Distance* distance_type(const random_access_iterator<T, Distance>&); -+inline Distance* distance_type(const random_access_iterator<T, Distance>&); - --template <class T> inline ptrdiff_t* distance_type(const T*); -+template <class T> inline ptrdiff_t* distance_type(const T*); - - Description - Distance_type is an iterator tag function: it is used to ---- stl-manual-3.30.orig/identity.html -+++ stl-manual-3.30/identity.html -@@ -130,7 +130,7 @@ The type of the result: T. - - --const T& operator()(const T&) const -+constT& operator()(const T&) const - - - Adaptable Unary Function ---- stl-manual-3.30.orig/hash_map.html -+++ stl-manual-3.30/hash_map.html -@@ -336,7 +336,7 @@ Const iterator used to iterate through a - - - --iterator begin() -+iterator begin() - - - Container -@@ -347,7 +347,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -358,7 +358,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -369,7 +369,7 @@ Returns an const_iterator point - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -380,7 +380,7 @@ Returns an const_iterator point - - - --size_type size() const -+size_type size() const - - - Container -@@ -391,7 +391,7 @@ Returns the size of the hash_map - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -402,7 +402,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -413,7 +413,7 @@ Returns the largest possible size of the - - - --size_type bucket_count() const -+size_type bucket_count() const - - - Hashed Associative Container -@@ -424,7 +424,7 @@ Returns the number of buckets used by th - - - --void resize(size_type n) -+void resize(size_type n) - - - Hashed Associative Container -@@ -435,7 +435,7 @@ Increases the bucket count to at least < - - - --hasher hash_funct() const -+hasher hash_funct() const - - - Hashed Associative Container -@@ -446,7 +446,7 @@ Returns the hasher object used - - - --key_equal key_eq() const -+key_equal key_eq() const - - - Hashed Associative Container -@@ -457,7 +457,7 @@ Returns the key_equal object us - - - --hash_map() -+hash_map() - - - Container -@@ -468,7 +468,7 @@ Creates an empty hash_map. - - - --hash_map(size_type n) -+hash_map(size_type n) - - - Hashed Associative Container -@@ -480,7 +480,7 @@ Creates an empty hash_map with - - - --hash_map(size_type n, -+hash_map(size_type n, - const hasher& h) - - -@@ -495,7 +495,7 @@ Creates an empty hash_map with - - - --hash_map(size_type n, -+hash_map(size_type n, - const hasher& h, - const key_equal& k) - -@@ -512,7 +512,7 @@ Creates an empty hash_map with - - - template <class InputIterator> --hash_map(InputIterator f, InputIterator l) -+hash_map(InputIterator f, InputIterator l) - [2] - - -@@ -527,7 +527,7 @@ Creates a hash_map with a copy of a rang - - - template <class InputIterator> --hash_map(InputIterator f, InputIterator l, -+hash_map(InputIterator f, InputIterator l, - size_type n) - [2] - -@@ -544,7 +544,7 @@ Creates a hash_map with a copy of a rang - - - template <class InputIterator> --hash_map(InputIterator f, InputIterator l, -+hash_map(InputIterator f, InputIterator l, - size_type n, const hasher& h) - [2] - -@@ -561,7 +561,7 @@ Creates a hash_map with a copy of a rang - - - template <class InputIterator> --hash_map(InputIterator f, InputIterator l, -+hash_map(InputIterator f, InputIterator l, - size_type n, const hasher& h, - const key_equal& k) - [2] -@@ -578,7 +578,7 @@ Creates a hash_map with a copy of a rang - - - --hash_map(const hash_map&) -+hash_map(const hash_map&) - - - Container -@@ -589,7 +589,7 @@ The copy constructor. - - - --hash_map& operator=(const hash_map&) -+hash_map& operator=(const hash_map&) - - - Container -@@ -600,7 +600,7 @@ The assignment operator - - - --void swap(hash_map&) -+void swap(hash_map&) - - - Container -@@ -613,7 +613,7 @@ Swaps the contents of two hash_maps. - - - pair<iterator, bool> --insert(const value_type& x) -+insert(const value_type& x) - - - -@@ -627,7 +627,7 @@ Inserts x into the hash_map - - - template <class InputIterator> --void insert(InputIterator f, InputIterator l) -+void insert(InputIterator f, InputIterator l) - [2] - - -@@ -640,7 +640,7 @@ Inserts a range into the hash_map - - --void erase(iterator pos) -+void erase(iterator pos) - - - Associative Container -@@ -651,7 +651,7 @@ Erases the element pointed to by pos - - - --size_type erase(const key_type& k) -+size_type erase(const key_type& k) - - - Associative Container -@@ -662,7 +662,7 @@ Erases the element whose key is k - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Associative Container -@@ -673,7 +673,7 @@ Erases all elements in a range. - - - --void clear() -+void clear() - - - Associative Container -@@ -684,7 +684,7 @@ Erases all of the elements. - - - --const_iterator find(const key_type& k) const -+const_iterator find(const key_type& k) const - - - Associative Container -@@ -695,7 +695,7 @@ Finds an element whose key is k - - - --iterator find(const key_type& k) -+iterator find(const key_type& k) - - - Associative Container -@@ -706,7 +706,7 @@ Finds an element whose key is k - - - --size_type count(const key_type& k) const -+size_type count(const key_type& k) const - - - Unique Associative Container -@@ -719,7 +719,7 @@ Counts the number of elements whose key - - - pair<const_iterator, const_iterator> --equal_range(const key_type& k) const -+equal_range(const key_type& k) const - - - -@@ -733,7 +733,7 @@ Finds a range containing all elements wh - - - pair<iterator, iterator> --equal_range(const key_type& k) -+equal_range(const key_type& k) - - - -@@ -747,7 +747,7 @@ Finds a range containing all elements wh - - - data_type& --operator[](const key_type& k) [3] -+operator[](const key_type& k) [3] - - - -@@ -760,7 +760,7 @@ See below. - - - --bool operator==(const hash_map&, -+bool operator==(const hash_map&, - const hash_map&) - - -@@ -792,7 +792,7 @@ Description - - - data_type& --operator[](const key_type& k) [3] -+operator[](const key_type& k) [3] - - - ---- stl-manual-3.30.orig/List.html -+++ stl-manual-3.30/List.html -@@ -247,7 +247,7 @@ Const iterator used to iterate backwards - - - --iterator begin() -+iterator begin() - - - Container -@@ -258,7 +258,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -269,7 +269,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -280,7 +280,7 @@ Returns a const_iterator pointi - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -291,7 +291,7 @@ Returns a const_iterator pointi - - - --reverse_iterator rbegin() -+reverse_iterator rbegin() - - - Reversible Container -@@ -303,7 +303,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() -+reverse_iterator rend() - - - Reversible Container -@@ -315,7 +315,7 @@ Returns a reverse_iterator poin - - - --const_reverse_iterator rbegin() const -+const_reverse_iterator rbegin() const - - - Reversible Container -@@ -327,7 +327,7 @@ Returns a const_reverse_iterator - - --const_reverse_iterator rend() const -+const_reverse_iterator rend() const - - - Reversible Container -@@ -339,7 +339,7 @@ Returns a const_reverse_iterator - - --size_type size() const -+size_type size() const - - - Container -@@ -354,7 +354,7 @@ Returns the size of the list. - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -365,7 +365,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -376,7 +376,7 @@ Returns the largest possible size of the - - - --list() -+list() - - - Container -@@ -387,7 +387,7 @@ Creates an empty list. - - - --list(size_type n) -+list(size_type n) - - - Sequence -@@ -398,7 +398,7 @@ Creates a list with n elements, - - - --list(size_type n, const T& t) -+list(size_type n, const T& t) - - - Sequence -@@ -409,7 +409,7 @@ Creates a list with n copies of - - - --list(const list&) -+list(const list&) - - - Container -@@ -422,7 +422,7 @@ The copy constructor. - - - template <class InputIterator> --list(InputIterator f, InputIterator l) -+list(InputIterator f, InputIterator l) - [2] - - -@@ -435,7 +435,7 @@ Creates a list with a copy of a range. - - - --~list() -+~list() - - - Container -@@ -446,7 +446,7 @@ The destructor. - - - --list& operator=(const list&) -+list& operator=(const list&) - - - Container -@@ -457,7 +457,7 @@ The assignment operator - - - --reference front() -+reference front() - - - Front Insertion Sequence -@@ -468,7 +468,7 @@ Returns the first element. - - - --const_reference front() const -+const_reference front() const - - - Front Insertion Sequence -@@ -479,7 +479,7 @@ Returns the first element. - - - --reference back() -+reference back() - - - Sequence -@@ -490,7 +490,7 @@ Returns the last element. - - - --const_reference back() const -+const_reference back() const - - - Back Insertion Sequence -@@ -501,7 +501,7 @@ Returns the last element. - - - --void push_front(const T&) -+void push_front(const T&) - - - Front Insertion Sequence -@@ -512,7 +512,7 @@ Inserts a new element at the beginning. - - - --void push_back(const T&) -+void push_back(const T&) - - - Back Insertion Sequence -@@ -523,7 +523,7 @@ Inserts a new element at the end. - - - --void pop_front() -+void pop_front() - - - Front Insertion Sequence -@@ -534,7 +534,7 @@ Removes the first element. - - - --void pop_back() -+void pop_back() - - - Back Insertion Sequence -@@ -545,7 +545,7 @@ Removes the last element. - - - --void swap(list&) -+void swap(list&) - - - Container -@@ -556,7 +556,7 @@ Swaps the contents of two lists. - - - --iterator insert(iterator pos, const T& x) -+iterator insert(iterator pos, const T& x) - - - Sequence -@@ -569,7 +569,7 @@ Inserts x before pos. - - - template <class InputIterator> --void insert(iterator pos, -+void insert(iterator pos, - InputIterator f, - InputIterator l) - [2] -@@ -585,7 +585,7 @@ Inserts the range [f, l) before - - - --void insert(iterator pos, -+void insert(iterator pos, - size_type n, const T& x) - - -@@ -598,7 +598,7 @@ Inserts n copies of x - - - --iterator erase(iterator pos) -+iterator erase(iterator pos) - - - Sequence -@@ -609,7 +609,7 @@ Erases the element at position pos - - --iterator erase(iterator first, iterator last) -+iterator erase(iterator first, iterator last) - - - Sequence -@@ -620,7 +620,7 @@ Erases the range [first, last) - - - --void clear() -+void clear() - - - Sequence -@@ -631,7 +631,7 @@ Erases all of the elements. - - - --void resize(n, t = T()) -+void resize(n, t = T()) - - - Sequence -@@ -642,7 +642,7 @@ Inserts or erases elements at the end su - - - --void splice(iterator pos, list& L) -+void splice(iterator pos, list& L) - - - list -@@ -654,7 +654,7 @@ See below. - - - --void splice(iterator pos, -+void splice(iterator pos, - list& L, - iterator i) - -@@ -669,7 +669,7 @@ See below. - - - --void splice(iterator pos, -+void splice(iterator pos, - list& L, - iterator f, iterator l) - -@@ -683,7 +683,7 @@ See below. - - - --void remove(const T& value) -+void remove(const T& value) - - - list -@@ -694,7 +694,7 @@ See below. - - - --void unique() -+void unique() - - - list -@@ -705,7 +705,7 @@ See below. - - - --void merge(list& L) -+void merge(list& L) - - - list -@@ -716,7 +716,7 @@ See below. - - - --void sort() -+void sort() - - - list -@@ -728,7 +728,7 @@ See below. - - - --bool operator==(const list&, -+bool operator==(const list&, - const list&) - - -@@ -743,7 +743,7 @@ Tests two lists for equality. This is a - - - --bool operator<(const list&, -+bool operator<(const list&, - const list&) - - -@@ -774,7 +774,7 @@ Description - - - --void splice(iterator position, -+void splice(iterator position, - list<T, Alloc>& x); - - -@@ -790,7 +790,7 @@ void splice(iterator position, - - - --void splice(iterator position, -+void splice(iterator position, - list<T, Alloc>& x, - iterator i); - -@@ -807,7 +807,7 @@ void splice(iterator position, - - - --void splice(iterator position, -+void splice(iterator position, - list<T, Alloc>& x, - iterator f, iterator l); - -@@ -823,7 +823,7 @@ void splice(iterator position, - - - --void remove(const T& val); -+void remove(const T& val); - - - Removes all elements that compare equal to val. The relative order -@@ -836,7 +836,7 @@ Removes all elements that compare equal - - - template<class Predicate> --void remove_if(Predicate p); -+void remove_if(Predicate p); - [4] - - -@@ -849,7 +849,7 @@ Removes all elements *i such th - - - --void unique(); -+void unique(); - - - Removes all but the first element in every consecutive group of -@@ -863,7 +863,7 @@ Removes all but the first element in eve - - - template<class BinaryPredicate> --void unique(BinaryPredicate p); -+void unique(BinaryPredicate p); - [4] - - -@@ -879,7 +879,7 @@ Removes all but the first element in eve - - - --void merge(list<T, Alloc>& x); -+void merge(list<T, Alloc>& x); - - - Both *this and x must be sorted according to operator<, and -@@ -897,7 +897,7 @@ Both *this and x must - - - template<class BinaryPredicate> --void merge(list<T, Alloc>& x, -+void merge(list<T, Alloc>& x, - BinaryPredicate Comp); - [4] - -@@ -919,7 +919,7 @@ void merge(list<T, Alloc>& x, - - - --void reverse(); -+void reverse(); - - - Reverses the order of elements in the list. All iterators remain -@@ -929,7 +929,7 @@ Reverses the order of elements in the li - - - --void sort(); -+void sort(); - - - Sorts *this according to operator<. The sort is stable, that is, -@@ -944,7 +944,7 @@ Sorts *this according to op - - - template<class BinaryPredicate> --void sort(BinaryPredicate comp); -+void sort(BinaryPredicate comp); - [4] - - ---- stl-manual-3.30.orig/priority_queue.html -+++ stl-manual-3.30/priority_queue.html -@@ -210,7 +210,7 @@ See below. - - - --priority_queue() -+priority_queue() - - - Default Constructible -@@ -222,7 +222,7 @@ The default constructor. Creates an emp - - - --priority_queue(const priority_queue&) -+priority_queue(const priority_queue&) - - - Assignable -@@ -233,7 +233,7 @@ The copy constructor. - - - --priority_queue(const Compare&) -+priority_queue(const Compare&) - - - priority_queue -@@ -245,7 +245,7 @@ See below. - - - --priority_queue(const value_type*, -+priority_queue(const value_type*, - const value_type*) - - -@@ -259,7 +259,7 @@ See below. - - - --priority_queue(const value_type*, -+priority_queue(const value_type*, - const value_type*, - const Compare&) - -@@ -275,7 +275,7 @@ See below. - - - priority_queue& --operator=(const priority_queue&) -+operator=(const priority_queue&) - - - -@@ -287,7 +287,7 @@ The assignment operator. - - - --bool empty() const -+bool empty() const - - - priority_queue -@@ -298,7 +298,7 @@ See below. - - - --size_type size() const -+size_type size() const - - - priority_queue -@@ -309,7 +309,7 @@ See below. - - - --const value_type& top() const -+const value_type& top() const - - - priority_queue -@@ -320,7 +320,7 @@ See below. - - - --void push(const value_type&) -+void push(const value_type&) - - - priority_queue -@@ -331,7 +331,7 @@ See below. - - - --void pop() [3] -+void pop() [3] - - - priority_queue -@@ -374,7 +374,7 @@ An unsigned integral type. This is the - - - --priority_queue(const Compare& comp) -+priority_queue(const Compare& comp) - - - The constructor. Creates an empty priority_queue, using comp -@@ -385,7 +385,7 @@ The constructor. Creates an empty p - - - --priority_queue(const value_type* first, -+priority_queue(const value_type* first, - const value_type* last) - - -@@ -398,7 +398,7 @@ The constructor. Creates a priority - - - --priority_queue(const value_type* first, -+priority_queue(const value_type* first, - const value_type* last, - const Compare& comp) - -@@ -411,7 +411,7 @@ The constructor. Creates a priority - - - --bool empty() const -+bool empty() const - - - Returns true if the priority_queue contains no elements, and false -@@ -420,7 +420,7 @@ Returns true if the priorit - - - --size_type size() const -+size_type size() const - - - Returns the number of elements contained in the priority_queue. -@@ -428,7 +428,7 @@ Returns the number of elements contained - - - --const value_type& top() const -+const value_type& top() const - - - Returns a const reference to the element at the top of the priority_queue. -@@ -441,7 +441,7 @@ Returns a const reference to the element - - - --void push(const value_type& x) -+void push(const value_type& x) - - - Inserts x into the priority_queue. Postcondition: size() will -@@ -450,7 +450,7 @@ Inserts x into the priority_que - - - --void pop() -+void pop() - - - Removes the element at the top of the priority_queue, that is, the ---- stl-manual-3.30.orig/greater.html -+++ stl-manual-3.30/greater.html -@@ -142,7 +142,7 @@ The type of the result: bool - - - --greater() -+greater() - - - DefaultConstructible -@@ -153,7 +153,7 @@ The default constructor. - - - --bool operator()(const T& x, const T& y) -+bool operator()(const T& x, const T& y) - - - Binary Function ---- stl-manual-3.30.orig/hash.html -+++ stl-manual-3.30/hash.html -@@ -149,7 +149,7 @@ Description - - - --size_t operator()(const T& x) -+size_t operator()(const T& x) - - - Hash Function ---- stl-manual-3.30.orig/Deque.html -+++ stl-manual-3.30/Deque.html -@@ -246,7 +246,7 @@ Const iterator used to iterate backwards - - - --iterator begin() -+iterator begin() - - - Container -@@ -257,7 +257,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -268,7 +268,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -279,7 +279,7 @@ Returns a const_iterator pointi - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -290,7 +290,7 @@ Returns a const_iterator pointi - - - --reverse_iterator rbegin() -+reverse_iterator rbegin() - - - Reversible Container -@@ -302,7 +302,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() -+reverse_iterator rend() - - - Reversible Container -@@ -314,7 +314,7 @@ Returns a reverse_iterator poin - - - --const_reverse_iterator rbegin() const -+const_reverse_iterator rbegin() const - - - Reversible Container -@@ -326,7 +326,7 @@ Returns a const_reverse_iterator - - --const_reverse_iterator rend() const -+const_reverse_iterator rend() const - - - Reversible Container -@@ -338,7 +338,7 @@ Returns a const_reverse_iterator - - --size_type size() const -+size_type size() const - - - Container -@@ -349,7 +349,7 @@ Returns the size of the deque. - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -360,7 +360,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -371,7 +371,7 @@ Returns the largest possible size of the - - - --reference operator[](size_type n) -+reference operator[](size_type n) - - - Random Access Container -@@ -382,7 +382,7 @@ Returns the n'th element. - - - --const_reference operator[](size_type n) const -+const_reference operator[](size_type n) const - - - Random Access Container -@@ -393,7 +393,7 @@ Returns the n'th element. - - - --deque() -+deque() - - - Container -@@ -404,7 +404,7 @@ Creates an empty deque. - - - --deque(size_type n) -+deque(size_type n) - - - Sequence -@@ -415,7 +415,7 @@ Creates a deque with n elements - - - --deque(size_type n, const T& t) -+deque(size_type n, const T& t) - - - Sequence -@@ -426,7 +426,7 @@ Creates a deque with n copies o - - - --deque(const deque&) -+deque(const deque&) - - - Container -@@ -439,7 +439,7 @@ The copy constructor. - - - template <class InputIterator> --deque(InputIterator f, InputIterator l) -+deque(InputIterator f, InputIterator l) - [4] - - -@@ -452,7 +452,7 @@ Creates a deque with a copy of a range. - - - --~deque() -+~deque() - - - Container -@@ -463,7 +463,7 @@ The destructor. - - - --deque& operator=(const deque&) -+deque& operator=(const deque&) - - - Container -@@ -474,7 +474,7 @@ The assignment operator - - - --reference front() -+reference front() - - - Front Insertion Sequence -@@ -485,7 +485,7 @@ Returns the first element. - - - --const_reference front() const -+const_reference front() const - - - Front Insertion Sequence -@@ -496,7 +496,7 @@ Returns the first element. - - - --reference back() -+reference back() - - - Back Insertion Sequence -@@ -507,7 +507,7 @@ Returns the last element. - - - --const_reference back() const -+const_reference back() const - - - Back Insertion Sequence -@@ -518,7 +518,7 @@ Returns the last element. - - - --void push_front(const T&) -+void push_front(const T&) - - - Front Insertion Sequence -@@ -529,7 +529,7 @@ Inserts a new element at the beginning. - - - --void push_back(const T&) -+void push_back(const T&) - - - Back Insertion Sequence -@@ -540,7 +540,7 @@ Inserts a new element at the end. - - - --void pop_front() -+void pop_front() - - - Front Insertion Sequence -@@ -551,7 +551,7 @@ Removes the first element. - - - --void pop_back() -+void pop_back() - - - Back Insertion Sequence -@@ -562,7 +562,7 @@ Removes the last element. - - - --void swap(deque&) -+void swap(deque&) - - - Container -@@ -574,7 +574,7 @@ Swaps the contents of two deques. - - - --iterator insert(iterator pos, -+iterator insert(iterator pos, - const T& x) - - -@@ -589,7 +589,7 @@ Inserts x before pos. - - - template <class InputIterator> --void insert(iterator pos, -+void insert(iterator pos, - InputIterator f, InputIterator l) - [4] - -@@ -604,7 +604,7 @@ Inserts the range [f, l) before - - - --void insert(iterator pos, -+void insert(iterator pos, - size_type n, const T& x) - - -@@ -617,7 +617,7 @@ Inserts n copies of x - - - --iterator erase(iterator pos) -+iterator erase(iterator pos) - - - Sequence -@@ -628,7 +628,7 @@ Erases the element at position pos - - --iterator erase(iterator first, iterator last) -+iterator erase(iterator first, iterator last) - - - Sequence -@@ -639,7 +639,7 @@ Erases the range [first, last) - - - --void clear() -+void clear() - - - Sequence -@@ -650,7 +650,7 @@ Erases all of the elements. - - - --void resize(n, t = T()) -+void resize(n, t = T()) - - - Sequence -@@ -662,7 +662,7 @@ Inserts or erases elements at the end su - - - --bool operator==(const deque&, -+bool operator==(const deque&, - const deque&) - - -@@ -677,7 +677,7 @@ Tests two deques for equality. This is - - - --bool operator<(const deque&, -+bool operator<(const deque&, - const deque&) - - ---- stl-manual-3.30.orig/greater_equal.html -+++ stl-manual-3.30/greater_equal.html -@@ -144,7 +144,7 @@ The type of the result: bool - - - --greater_equal() -+greater_equal() - - - DefaultConstructible -@@ -155,7 +155,7 @@ The default constructor. - - - --bool operator()(const T& x, const T& y) -+bool operator()(const T& x, const T& y) - - - Binary Function ---- stl-manual-3.30.orig/mem_fun_t.html -+++ stl-manual-3.30/mem_fun_t.html -@@ -191,7 +191,7 @@ The type of the result: Result - - - --Result operator()(X* x) const -+Result operator()(X* x) const - - - -@@ -205,7 +205,7 @@ Function call operator. Invokes x-& - - - --explicit mem_fun_t(Result (X::*f)()) -+explicit mem_fun_t(Result (X::*f)()) - - - -@@ -220,7 +220,7 @@ See below. - - template <class Result, class X> - mem_fun_t<Result, X> --mem_fun(Result (X::*f)()); -+mem_fun(Result (X::*f)()); - - - -@@ -248,7 +248,7 @@ Description - - - --explicit mem_fun_t(Result (X::*f)()) -+explicit mem_fun_t(Result (X::*f)()) - - - -@@ -261,7 +261,7 @@ The constructor. Creates a mem_fun_ - - template <class Result, class X> - mem_fun_t<Result, X> --mem_fun(Result (X::*f)()); -+mem_fun(Result (X::*f)()); - - - ---- stl-manual-3.30.orig/istream_iterator.html -+++ stl-manual-3.30/istream_iterator.html -@@ -127,7 +127,7 @@ Description - - - --istream_iterator() -+istream_iterator() - - - istream_iterator -@@ -138,7 +138,7 @@ See below. - - - --istream_iterator(istream&) -+istream_iterator(istream&) - - - istream_iterator -@@ -149,7 +149,7 @@ See below. - - - --istream_iterator(const istream_iterator&) -+istream_iterator(const istream_iterator&) - - - Trivial Iterator -@@ -160,7 +160,7 @@ The copy constructor - - - --istream_iterator& operator=(const istream_iterator&) -+istream_iterator& operator=(const istream_iterator&) - - - Trivial Iterator -@@ -171,7 +171,7 @@ The assignment operator - - - --const T& operator*() const -+constT& operator*() const - - - Input Iterator -@@ -182,7 +182,7 @@ Returns the next object in the stream. - - - --istream_iterator& operator++() -+istream_iterator& operator++() - - - Input Iterator -@@ -193,7 +193,7 @@ Preincrement. - - - --istream_iterator& operator++(int) -+istream_iterator& operator++(int) - - - Input Iterator -@@ -204,7 +204,7 @@ Postincrement. - - - --bool operator==(const istream_iterator&, const istream_iterator&) -+bool operator==(const istream_iterator&, const istream_iterator&) - - - Trivial iterator -@@ -215,7 +215,7 @@ The equality operator. This is a global - - - --input_iterator_tag iterator_category(const istream_iterator&) -+input_iterator_tag iterator_category(const istream_iterator&) - - - iterator tags -@@ -226,7 +226,7 @@ Returns the iterator's category. - - - --T* value_type(const istream_iterator&) -+T* value_type(const istream_iterator&) - - - iterator tags -@@ -237,7 +237,7 @@ Returns the iterator's value type. - - - --Distance* distance_type(const istream_iterator&) -+Distance* distance_type(const istream_iterator&) - - - iterator tags -@@ -263,7 +263,7 @@ Description - - - --istream_iterator() -+istream_iterator() - - - The default constructor: Constructs an end-of-stream iterator. -@@ -273,7 +273,7 @@ The default constructor: Constructs an - - - --istream_iterator(istream& s) -+istream_iterator(istream& s) - - - Creates an istream_iterator that reads values from the input ---- stl-manual-3.30.orig/binder1st.html -+++ stl-manual-3.30/binder1st.html -@@ -147,7 +147,7 @@ The type of the result: AdaptableBin - - - --result_type operator()(const argument_type& x) const -+result_type operator()(const argument_type& x) const - - - -@@ -161,7 +161,7 @@ arguments with which this binder1st< - - - --binder1st(const AdaptableBinaryFunction& F, -+binder1st(const AdaptableBinaryFunction& F, - AdaptableBinaryFunction::first_argument_type c) - - -@@ -177,7 +177,7 @@ See below - - template <class AdaptableBinaryFunction, class T> - binder1st<AdaptableBinaryFunction> --bind1st(const AdaptableBinaryFunction& F, const T& c); -+bind1st(const AdaptableBinaryFunction& F, const T& c); - - - -@@ -205,7 +205,7 @@ Description - - - --binder1st(const AdaptableBinaryFunction& F, -+binder1st(const AdaptableBinaryFunction& F, - AdaptableBinaryFunction::first_argument_type c) - - -@@ -221,7 +221,7 @@ call F(c, x). - - template <class AdaptableBinaryFunction, class T> - binder1st<AdaptableBinaryFunction> --bind1st(const AdaptableBinaryFunction& F, const T& c); -+bind1st(const AdaptableBinaryFunction& F, const T& c); - - - ---- stl-manual-3.30.orig/logical_and.html -+++ stl-manual-3.30/logical_and.html -@@ -148,7 +148,7 @@ The type of the result: bool - - - --bool operator()(const T& x, const T& y) const -+bool operator()(const T& x, const T& y) const - - - Binary Function -@@ -159,7 +159,7 @@ Function call operator. The return valu - - - --logical_and() -+logical_and() - - - Default Constructible ---- stl-manual-3.30.orig/binary_negate.html -+++ stl-manual-3.30/binary_negate.html -@@ -159,7 +159,7 @@ The type of the result: bool - - - --binary_negate(const AdaptableBinaryPredicate& pred) -+binary_negate(const AdaptableBinaryPredicate& pred) - - - -@@ -174,7 +174,7 @@ See below. - - template <class AdaptableBinaryPredicate> - binary_negate<AdaptableBinaryPredicate> --not2(const AdaptableBinaryPredicate& pred); -+not2(const AdaptableBinaryPredicate& pred); - - - -@@ -202,7 +202,7 @@ Description - - - --binary_negate(const AdaptableBinaryPredicate& pred) -+binary_negate(const AdaptableBinaryPredicate& pred) - - - -@@ -215,7 +215,7 @@ whose underlying predicate is pred - template <class AdaptableBinaryPredicate> - binary_negate<AdaptableBinaryPredicate> --not2(const AdaptableBinaryPredicate& pred); -+not2(const AdaptableBinaryPredicate& pred); - - - ---- stl-manual-3.30.orig/mem_fun1_t.html -+++ stl-manual-3.30/mem_fun1_t.html -@@ -224,7 +224,7 @@ The type of the result: Result - - - --Result operator()(X* x, Arg a) const -+Result operator()(X* x, Arg a) const - - - -@@ -238,7 +238,7 @@ Function call operator. Invokes x-& - - - --explicit mem_fun1_t(Result (X::*f)(Arg)) -+explicit mem_fun1_t(Result (X::*f)(Arg)) - - - -@@ -253,7 +253,7 @@ See below. - - template <class Result, class X, class Arg> - mem_fun1_t<Result, X, Arg> --mem_fun(Result (X::*f)(Arg)); [2] -+mem_fun(Result (X::*f)(Arg)); [2] - - - -@@ -281,7 +281,7 @@ Description - - - --explicit mem_fun1_t(Result (X::*f)(Arg)) -+explicit mem_fun1_t(Result (X::*f)(Arg)) - - - -@@ -294,7 +294,7 @@ The constructor. Creates a mem_fun1 - - template <class Result, class X, class Arg> - mem_fun1_t<Result, X, Arg> --mem_fun(Result (X::*f)(Arg)); [2] -+mem_fun(Result (X::*f)(Arg)); [2] - - - ---- stl-manual-3.30.orig/pointer_to_unary_function.html -+++ stl-manual-3.30/pointer_to_unary_function.html -@@ -177,7 +177,7 @@ The type of the result: Result - - - --result_type operator()(argument_type x) -+result_type operator()(argument_type x) - - - Unary Function -@@ -188,7 +188,7 @@ Function call operator. - - - --pointer_to_unary_function(Result (*f)(Arg)) -+pointer_to_unary_function(Result (*f)(Arg)) - - - pointer_to_unary_function -@@ -199,7 +199,7 @@ See below. - - - --pointer_to_unary_function() -+pointer_to_unary_function() - - - pointer_to_unary_function -@@ -213,7 +213,7 @@ See below. - - template <class Arg, class Result> - pointer_to_unary_function<Arg, Result> --ptr_fun(Result (*x)(Arg)); -+ptr_fun(Result (*x)(Arg)); - - - -@@ -240,7 +240,7 @@ Description - - - --pointer_to_unary_function(Result (*f)(Arg)) -+pointer_to_unary_function(Result (*f)(Arg)) - - - The constructor. Creates a pointer_to_unary_function whose underlying -@@ -249,7 +249,7 @@ The constructor. Creates a pointer_ - - - --pointer_to_unary_function() -+pointer_to_unary_function() - - - The default constructor. This creates a pointer_to_unary_function -@@ -262,13 +262,13 @@ The default constructor. This creates a - - template <class Arg, class Result> - pointer_to_unary_function<Arg, Result> --ptr_fun(Result (*x)(Arg)); -+ptr_fun(Result (*x)(Arg)); - - - - If f is of type Result (*)(Arg) then --ptr_fun(f) is equivalent to --pointer_to_unary_function<Arg,Result>(f), -+ptr_fun(f) is equivalent to -+pointer_to_unary_function<Arg,Result>(f), - but more convenient. This is a global function, not a member. - - ---- stl-manual-3.30.orig/multiset.html -+++ stl-manual-3.30/multiset.html -@@ -347,7 +347,7 @@ Const iterator used to iterate backwards - - - --iterator begin() const -+iterator begin() const - - - Container -@@ -358,7 +358,7 @@ Returns an iterator pointing to - - - --iterator end() const -+iterator end() const - - - Container -@@ -369,7 +369,7 @@ Returns an iterator pointing to - - - --reverse_iterator rbegin() const -+reverse_iterator rbegin() const - - - Reversible Container -@@ -381,7 +381,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() const -+reverse_iterator rend() const - - - Reversible Container -@@ -393,7 +393,7 @@ Returns a reverse_iterator poin - - - --size_type size() const -+size_type size() const - - - Container -@@ -404,7 +404,7 @@ Returns the size of the multiset - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -415,7 +415,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -426,7 +426,7 @@ Returns the largest possible size of the - - - --key_compare key_comp() const -+key_compare key_comp() const - - - Sorted Associative Container -@@ -437,7 +437,7 @@ Returns the key_compare object - - - --value_compare value_comp() const -+value_compare value_comp() const - - - Sorted Associative Container -@@ -448,7 +448,7 @@ Returns the value_compare objec - - - --multiset() -+multiset() - - - Container -@@ -459,7 +459,7 @@ Creates an empty multiset. - - - --multiset(const key_compare& comp) -+multiset(const key_compare& comp) - - - Sorted Associative Container -@@ -472,7 +472,7 @@ Creates an empty multiset, usin - - - template <class InputIterator> --multiset(InputIterator f, InputIterator l) -+multiset(InputIterator f, InputIterator l) - [1] - - -@@ -487,7 +487,7 @@ Creates a multiset with a copy of a rang - - - template <class InputIterator> --multiset(InputIterator f, InputIterator l, -+multiset(InputIterator f, InputIterator l, - const key_compare& comp) - [1] - -@@ -502,7 +502,7 @@ Creates a multiset with a copy of a rang - - - --multiset(const multiset&) -+multiset(const multiset&) - - - Container -@@ -513,7 +513,7 @@ The copy constructor. - - - --multiset& operator=(const multiset&) -+multiset& operator=(const multiset&) - - - Container -@@ -524,7 +524,7 @@ The assignment operator - - - --void swap(multiset&) -+void swap(multiset&) - - - Container -@@ -535,7 +535,7 @@ Swaps the contents of two multisets. - - - --iterator insert(const value_type& x) -+iterator insert(const value_type& x) - - - Multiple Associative Container -@@ -547,7 +547,7 @@ Inserts x into the multiset - - - --iterator insert(iterator pos, -+iterator insert(iterator pos, - const value_type& x) - - -@@ -563,7 +563,7 @@ Inserts x into the multiset - - - template <class InputIterator> --void insert(InputIterator, InputIterator) -+void insert(InputIterator, InputIterator) - [1] - - -@@ -576,7 +576,7 @@ Inserts a range into the multiset - - --void erase(iterator pos) -+void erase(iterator pos) - - - Associative Container -@@ -587,7 +587,7 @@ Erases the element pointed to by pos - - - --size_type erase(const key_type& k) -+size_type erase(const key_type& k) - - - Associative Container -@@ -598,7 +598,7 @@ Erases the element whose key is k - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Associative Container -@@ -609,7 +609,7 @@ Erases all elements in a range. - - - --void clear() -+void clear() - - - Associative Container -@@ -620,7 +620,7 @@ Erases all of the elements. - - - --iterator find(const key_type& k) const -+iterator find(const key_type& k) const - - - Associative Container -@@ -631,7 +631,7 @@ Finds an element whose key is k - - - --size_type count(const key_type& k) const -+size_type count(const key_type& k) const - - - Associative Container -@@ -642,7 +642,7 @@ Counts the number of elements whose key - - - --iterator lower_bound(const key_type& k) const -+iterator lower_bound(const key_type& k) const - - - Sorted Associative Container -@@ -653,7 +653,7 @@ Finds the first element whose key is not - - - --iterator upper_bound(const key_type& k) const -+iterator upper_bound(const key_type& k) const - - - Sorted Associative Container -@@ -666,7 +666,7 @@ Finds the first element whose key greate - - - pair<iterator, iterator> --equal_range(const key_type& k) const -+equal_range(const key_type& k) const - - - -@@ -679,7 +679,7 @@ Finds a range containing all elements wh - - - --bool operator==(const multiset&, -+bool operator==(const multiset&, - const multiset&) - - -@@ -694,7 +694,7 @@ Tests two multisets for equality. This - - - --bool operator<(const multiset&, -+bool operator<(const multiset&, - const multiset&) - - ---- stl-manual-3.30.orig/pointer_to_binary_function.html -+++ stl-manual-3.30/pointer_to_binary_function.html -@@ -197,7 +197,7 @@ The type of the result: Result - - - --Result operator()(Arg1 x, Arg2 y) -+Result operator()(Arg1 x, Arg2 y) - - - Binary Function -@@ -208,7 +208,7 @@ Function call operator. - - - --pointer_to_binary_function(Result (*f)(Arg1, Arg2)) -+pointer_to_binary_function(Result (*f)(Arg1, Arg2)) - - - pointer_to_binary_function -@@ -219,7 +219,7 @@ See below. - - - --pointer_to_binary_function() -+pointer_to_binary_function() - - - pointer_to_binary_function -@@ -233,7 +233,7 @@ See below. - - template <class Arg1, class Arg2, class Result> - pointer_to_unary_function<Arg1, Arg2, Result> --ptr_fun(Result (*x)(Arg1, Arg2)); -+ptr_fun(Result (*x)(Arg1, Arg2)); - - - -@@ -260,7 +260,7 @@ Description - - - --pointer_to_binary_function(Result (*f)(Arg1, Arg2)) -+pointer_to_binary_function(Result (*f)(Arg1, Arg2)) - - - The constructor. Creates a pointer_to_binary_function whose underlying -@@ -269,7 +269,7 @@ The constructor. Creates a pointer_ - - - --pointer_to_binary_function() -+pointer_to_binary_function() - - - The default constructor. This creates a pointer_to_binary_function -@@ -282,13 +282,13 @@ The default constructor. This creates a - - template <class Arg1, class Arg2, class Result> - pointer_to_unary_function<Arg1, Arg2, Result> --ptr_fun(Result (*x)(Arg1, Arg2)); -+ptr_fun(Result (*x)(Arg1, Arg2)); - - - - If f is of type Result (*)(Arg1, Arg2) then --ptr_fun(f) is equivalent to --pointer_to_binary_function<Arg1,Arg2,Result>(f), -+ptr_fun(f) is equivalent to -+pointer_to_binary_function<Arg1,Arg2,Result>(f), - but more convenient. This is a global function, not a member - function. - ---- stl-manual-3.30.orig/hash_multimap.html -+++ stl-manual-3.30/hash_multimap.html -@@ -343,7 +343,7 @@ Const iterator used to iterate through a - - - --iterator begin() -+iterator begin() - - - Container -@@ -354,7 +354,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -365,7 +365,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -376,7 +376,7 @@ Returns an const_iterator point - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -387,7 +387,7 @@ Returns an const_iterator point - - - --size_type size() const -+size_type size() const - - - Container -@@ -398,7 +398,7 @@ Returns the size of the hash_multima - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -409,7 +409,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -420,7 +420,7 @@ Returns the largest possible size of the - - - --size_type bucket_count() const -+size_type bucket_count() const - - - Hashed Associative Container -@@ -431,7 +431,7 @@ Returns the number of buckets used by th - - - --void resize(size_type n) -+void resize(size_type n) - - - Hashed Associative Container -@@ -442,7 +442,7 @@ Increases the bucket count to at least < - - - --hasher hash_funct() const -+hasher hash_funct() const - - - Hashed Associative Container -@@ -453,7 +453,7 @@ Returns the hasher object used - - - --key_equal key_eq() const -+key_equal key_eq() const - - - Hashed Associative Container -@@ -464,7 +464,7 @@ Returns the key_equal object us - - - --hash_multimap() -+hash_multimap() - - - Container -@@ -475,7 +475,7 @@ Creates an empty hash_multimap. - - - --hash_multimap(size_type n) -+hash_multimap(size_type n) - - - Hashed Associative Container -@@ -487,7 +487,7 @@ Creates an empty hash_multimap - - - --hash_multimap(size_type n, -+hash_multimap(size_type n, - const hasher& h) - - -@@ -502,7 +502,7 @@ Creates an empty hash_multimap - - - --hash_multimap(size_type n, -+hash_multimap(size_type n, - const hasher& h, - const key_equal& k) - -@@ -519,7 +519,7 @@ Creates an empty hash_multimap - - - template <class InputIterator> --hash_multimap(InputIterator, InputIterator) -+hash_multimap(InputIterator, InputIterator) - [2] - - -@@ -534,7 +534,7 @@ Creates a hash_multimap with a copy of a - - - template <class InputIterator> --hash_multimap(InputIterator, InputIterator, -+hash_multimap(InputIterator, InputIterator, - size_type n) - [2] - -@@ -551,7 +551,7 @@ Creates a hash_multimap with a copy of a - - - template <class InputIterator> --hash_multimap(InputIterator, InputIterator, -+hash_multimap(InputIterator, InputIterator, - size_type n, const hasher& h) - [2] - -@@ -568,7 +568,7 @@ Creates a hash_multimap with a copy of a - - - template <class InputIterator> --hash_multimap(InputIterator, InputIterator, -+hash_multimap(InputIterator, InputIterator, - size_type n, const hasher& h, - const key_equal& k) - [2] -@@ -585,7 +585,7 @@ Creates a hash_multimap with a copy of a - - - --hash_multimap(const hash_multimap&) -+hash_multimap(const hash_multimap&) - - - Container -@@ -596,7 +596,7 @@ The copy constructor. - - - --hash_multimap& operator=(const hash_multimap&) -+hash_multimap& operator=(const hash_multimap&) - - - Container -@@ -607,7 +607,7 @@ The assignment operator - - - --void swap(hash_multimap&) -+void swap(hash_multimap&) - - - Container -@@ -618,7 +618,7 @@ Swaps the contents of two hash_multimaps - - - --iterator insert(const value_type& x) -+iterator insert(const value_type& x) - - - Multiple Associative Container -@@ -631,7 +631,7 @@ Inserts x into the hash_mul - - - template <class InputIterator> --void insert(InputIterator, InputIterator) -+void insert(InputIterator, InputIterator) - [2] - - -@@ -644,7 +644,7 @@ Inserts a range into the hash_multim - - - --void erase(iterator pos) -+void erase(iterator pos) - - - Associative Container -@@ -655,7 +655,7 @@ Erases the element pointed to by pos - - - --size_type erase(const key_type& k) -+size_type erase(const key_type& k) - - - Associative Container -@@ -666,7 +666,7 @@ Erases the element whose key is k - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Associative Container -@@ -677,7 +677,7 @@ Erases all elements in a range. - - - --void clear() -+void clear() - - - Associative Container -@@ -688,7 +688,7 @@ Erases all of the elements. - - - --const_iterator find(const key_type& k) const -+const_iterator find(const key_type& k) const - - - Associative Container -@@ -699,7 +699,7 @@ Finds an element whose key is k - - - --iterator find(const key_type& k) -+iterator find(const key_type& k) - - - Associative Container -@@ -710,7 +710,7 @@ Finds an element whose key is k - - - --size_type count(const key_type& k) const -+size_type count(const key_type& k) const - - - Associative Container -@@ -723,7 +723,7 @@ Counts the number of elements whose key - - - pair<const_iterator, const_iterator> --equal_range(const key_type& k) const -+equal_range(const key_type& k) const - - - -@@ -737,7 +737,7 @@ Finds a range containing all elements wh - - - pair<iterator, iterator> --equal_range(const key_type& k) -+equal_range(const key_type& k) - - - -@@ -750,7 +750,7 @@ Finds a range containing all elements wh - - - --bool operator==(const hash_multimap&, -+bool operator==(const hash_multimap&, - const hash_multimap&) - - ---- stl-manual-3.30.orig/bit_vector.html -+++ stl-manual-3.30/bit_vector.html -@@ -204,7 +204,7 @@ Const iterator used to iterate backwards - - - --iterator begin() -+iterator begin() - - - Container -@@ -215,7 +215,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -226,7 +226,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -237,7 +237,7 @@ Returns a const_iterator pointi - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -248,7 +248,7 @@ Returns a const_iterator pointi - - - --reverse_iterator rbegin() -+reverse_iterator rbegin() - - - Reversible Container -@@ -260,7 +260,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() -+reverse_iterator rend() - - - Reversible Container -@@ -272,7 +272,7 @@ Returns a reverse_iterator poin - - - --const_reverse_iterator rbegin() const -+const_reverse_iterator rbegin() const - - - Reversible Container -@@ -284,7 +284,7 @@ Returns a const_reverse_iterator - - --const_reverse_iterator rend() const -+const_reverse_iterator rend() const - - - Reversible Container -@@ -296,7 +296,7 @@ Returns a const_reverse_iterator - - --size_type size() const -+size_type size() const - - - Container -@@ -307,7 +307,7 @@ Returns the number of elements in the - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -318,7 +318,7 @@ Returns the largest possible size of the - - - --size_type capacity() const -+size_type capacity() const - - - bit_vector -@@ -329,7 +329,7 @@ See below. - - - --bool empty() const -+bool empty() const - - - Container -@@ -340,7 +340,7 @@ See below. - - - --reference operator[](size_type n) -+reference operator[](size_type n) - - - Random Access Container -@@ -351,7 +351,7 @@ Returns the n'th element. - - - --const_reference operator[](size_type n) const -+const_reference operator[](size_type n) const - - - Random Access Container -@@ -362,7 +362,7 @@ Returns the n'th element. - - - --bit_vector() -+bit_vector() - - - Container -@@ -373,7 +373,7 @@ Creates an empty bit_vector. - - - --bit_vector(size_type n) -+bit_vector(size_type n) - - - Sequence -@@ -384,7 +384,7 @@ Creates a bit_vector with n ele - - - --bit_vector(size_type n, bool t) -+bit_vector(size_type n, bool t) - - - Sequence -@@ -395,7 +395,7 @@ Creates a bit_vector with n cop - - - --bit_vector(const bit_vector&) -+bit_vector(const bit_vector&) - - - Container -@@ -408,7 +408,7 @@ The copy constructor. - - - template <class InputIterator> --bit_vector(InputIterator, InputIterator) -+bit_vector(InputIterator, InputIterator) - [1] - - -@@ -421,7 +421,7 @@ Creates a bit_vector with a copy of a ra - - - --~bit_vector() -+~bit_vector() - - - Container -@@ -432,7 +432,7 @@ The destructor. - - - --bit_vector& operator=(const bit_vector&) -+bit_vector& operator=(const bit_vector&) - - - Container -@@ -443,7 +443,7 @@ The assignment operator - - - --void reserve(size_t) -+void reserve(size_t) - - - bit_vector -@@ -454,7 +454,7 @@ See below. - - - --reference front() -+reference front() - - - Sequence -@@ -465,7 +465,7 @@ Returns the first element. - - - --const_reference front() const -+const_reference front() const - - - Sequence -@@ -476,7 +476,7 @@ Returns the first element. - - - --reference back() -+reference back() - - - Back Insertion Sequence -@@ -487,7 +487,7 @@ Returns the last element. - - - --const_reference back() const -+const_reference back() const - - - Back Insertion Sequence -@@ -498,7 +498,7 @@ Returns the last element. - - - --void push_back(const T&) -+void push_back(const T&) - - - Back Insertion Sequence -@@ -509,7 +509,7 @@ Inserts a new element at the end. - - - --void pop_back() -+void pop_back() - - - Back Insertion Sequence -@@ -520,7 +520,7 @@ Removes the last element. - - - --void swap(bit_vector&) -+void swap(bit_vector&) - - - Container -@@ -532,7 +532,7 @@ Swaps the contents of two bit_vectors. - - - --void swap(bit_vector::reference x, -+void swap(bit_vector::reference x, - bit_vector::reference y) - - -@@ -545,7 +545,7 @@ See below. - - - --iterator insert(iterator pos, bool x) -+iterator insert(iterator pos, bool x) - - - Sequence -@@ -558,7 +558,7 @@ Inserts x before pos. - - - template <class InputIterator> --void insert(iterator pos, -+void insert(iterator pos, - InputIterator f, InputIterator l) - [1] - -@@ -573,7 +573,7 @@ Inserts the range [f, l) before - - - --void insert(iterator pos, -+void insert(iterator pos, - size_type n, bool x) - - -@@ -586,7 +586,7 @@ Inserts n copies of x - - - --void erase(iterator pos) -+void erase(iterator pos) - - - Sequence -@@ -597,7 +597,7 @@ Erases the element at position pos - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Sequence -@@ -608,7 +608,7 @@ Erases the range [first, last) - - - --void clear() -+void clear() - - - Sequence -@@ -620,7 +620,7 @@ Erases all of the elements. - - - --bool operator==(const bit_vector&, -+bool operator==(const bit_vector&, - const bit_vector&) - - -@@ -635,7 +635,7 @@ Tests two bit_vectors for equality. Thi - - - --bool operator<(const bit_vector&, -+bool operator<(const bit_vector&, - const bit_vector&) - - -@@ -680,7 +680,7 @@ A proxy class that acts as a reference t - - - --size_type capacity() const -+size_type capacity() const - - - Number of bits for which memory has been allocated. -@@ -690,7 +690,7 @@ Number of bits for which memory has been - - - --void reserve(size_type n) -+void reserve(size_type n) - - - If n is less than or equal to capacity(), this call has no effect. -@@ -703,7 +703,7 @@ If n is less than or equal to < - - - --void swap(bit_vector::reference x, -+void swap(bit_vector::reference x, - bit_vector::reference y) - - ---- stl-manual-3.30.orig/project2nd.html -+++ stl-manual-3.30/project2nd.html -@@ -159,7 +159,7 @@ The type of the result: Arg2. - - - --Arg1 operator()(const Arg1&, const Arg2& y) const -+Arg1 operator()(const Arg1&, const Arg2& y) const - - - Adaptable Binary Function ---- stl-manual-3.30.orig/ReverseIterator.html -+++ stl-manual-3.30/ReverseIterator.html -@@ -193,7 +193,7 @@ See below - - - --reverse_iterator() -+reverse_iterator() - - - Trivial Iterator -@@ -204,7 +204,7 @@ The default constructor - - - --reverse_iterator(const reverse_iterator& x) -+reverse_iterator(const reverse_iterator& x) - - - Trivial Iterator -@@ -215,7 +215,7 @@ The copy constructor - - - --reverse_iterator& operator=(const reverse_iterator& x) -+reverse_iterator& operator=(const reverse_iterator& x) - - - Trivial Iterator -@@ -226,7 +226,7 @@ The assignment operator - - - --reverse_iterator(RandomAccessIterator x) -+reverse_iterator(RandomAccessIterator x) - - - reverse_iterator -@@ -237,7 +237,7 @@ See below. - - - --RandomAccessIterator base() -+RandomAccessIterator base() - - - reverse_iterator -@@ -248,7 +248,7 @@ See below. - - - --Reference operator*() const -+Reference operator*() const - - - Trivial Iterator -@@ -259,7 +259,7 @@ The dereference operator - - - --reverse_iterator& operator++() -+reverse_iterator& operator++() - - - Forward Iterator -@@ -270,7 +270,7 @@ Preincrement - - - --reverse_iterator operator++(int) -+reverse_iterator operator++(int) - - - Forward Iterator -@@ -281,7 +281,7 @@ Postincrement - - - --reverse_iterator& operator--() -+reverse_iterator& operator--() - - - Bidirectional Iterator -@@ -292,7 +292,7 @@ Predecrement - - - --reverse_iterator operator--(int) -+reverse_iterator operator--(int) - - - Bidirectional Iterator -@@ -303,7 +303,7 @@ Postdecrement - - - --reverse_iterator operator+(Distance) -+reverse_iterator operator+(Distance) - - - Random Access Iterator -@@ -314,7 +314,7 @@ Iterator addition - - - --reverse_iterator& operator+=(Distance) -+reverse_iterator& operator+=(Distance) - - - Random Access Iterator -@@ -325,7 +325,7 @@ Iterator addition - - - --reverse_iterator operator-(Distance) -+reverse_iterator operator-(Distance) - - - Random Access Iterator -@@ -336,7 +336,7 @@ Iterator subtraction - - - --reverse_iterator& operator-=(Distance) -+reverse_iterator& operator-=(Distance) - - - Random Access Iterator -@@ -347,7 +347,7 @@ Iterator subtraction - - - --Reference operator[](Distance) -+Reference operator[](Distance) - - - Random Access Iterator -@@ -358,7 +358,7 @@ Random access to an element. - - - --reverse_iterator operator+(Distance, reverse_iterator) -+reverse_iterator operator+(Distance, reverse_iterator) - - - Random Access Iterator -@@ -369,7 +369,7 @@ Iterator addition. This is a global fun - - - --Distance operator-(const reverse_iterator&, const reverse_iterator&) -+Distance operator-(const reverse_iterator&, const reverse_iterator&) - - - Random Access Iterator -@@ -381,7 +381,7 @@ Finds the distance between two iterators - - - --bool operator==(const reverse_iterator&, const reverse_iterator&) -+bool operator==(const reverse_iterator&, const reverse_iterator&) - - - Trivial Iterator -@@ -393,7 +393,7 @@ Compares two iterators for equality. - - - --bool operator<(const reverse_iterator&, const reverse_iterator&) -+bool operator<(const reverse_iterator&, const reverse_iterator&) - - - Random Access Iterator -@@ -405,7 +405,7 @@ Determines whether the first argument pr - - - --random_access_iterator_tag iterator_category(const reverse_iterator&) -+random_access_iterator_tag iterator_category(const reverse_iterator&) - - - Iterator tags -@@ -417,7 +417,7 @@ Returns the iterator's category. - - - --T* value_type(const reverse_iterator&) -+T* value_type(const reverse_iterator&) - - - Iterator tags -@@ -429,7 +429,7 @@ Returns the iterator's value type. - - - --Distance* distance_type(const reverse_iterator&) -+Distance* distance_type(const reverse_iterator&) - - - Iterator tags -@@ -464,7 +464,7 @@ A typedef for reverse_iterator< - - --RandomAccessIterator base() -+RandomAccessIterator base() - - - Returns the current value of the reverse_iterator's base iterator. -@@ -476,7 +476,7 @@ Returns the current value of the rev - - - --reverse_iterator(RandomAccessIterator i) -+reverse_iterator(RandomAccessIterator i) - - - Constructs a reverse_iterator whose base iterator is i. ---- stl-manual-3.30.orig/pair.html -+++ stl-manual-3.30/pair.html -@@ -150,7 +150,7 @@ See below. - - - --pair() -+pair() - - - pair -@@ -161,7 +161,7 @@ The default constructor. See below. - - - --pair(const first_type&, const second_type&) -+pair(const first_type&, const second_type&) - - - pair -@@ -172,7 +172,7 @@ The pair constructor. See below. - - - --pair(const pair&) -+pair(const pair&) - - - Assignable -@@ -183,7 +183,7 @@ The copy constructor - - - --pair& operator=(const pair&) -+pair& operator=(const pair&) - - - Assignable -@@ -216,7 +216,7 @@ See below. - - - --bool operator==(const pair&, const pair&) -+bool operator==(const pair&, const pair&) - - - pair -@@ -227,7 +227,7 @@ See below. - - - --bool operator<(const pair&, const pair&) -+bool operator<(const pair&, const pair&) - - - pair -@@ -240,7 +240,7 @@ See below. - - - template <class T1, class T2> --pair<T1, T2> make_pair(const T1&, const T2&) -+pair<T1,T2> make_pair(const T1&, const T2&) - - - -@@ -284,7 +284,7 @@ The type of the pair's second component. - - - --pair() -+pair() - - - The default constructor. It uses constructs objects of types -@@ -294,7 +294,7 @@ The default constructor. It uses constr - - - --pair(const first_type& x, const second_type& y) -+pair(const first_type& x, const second_type& y) - - - The pair constructor. Constructs a pair such that first is constructed -@@ -321,7 +321,7 @@ Public member variable of type secon - - - template <class T1, class T2> --bool operator==(const pair<T1,T2>& x, -+bool operator==(const pair<T1,T2>& x, - const pair<T1,T2>& y); - - -@@ -337,7 +337,7 @@ This is a global function, not a member - - - template <class T1, class T2> --bool operator<(const pair<T1,T2>& x, -+bool operator<(const pair<T1,T2>& x, - const pair<T1,T2>& y); - - -@@ -357,7 +357,7 @@ This is a global function, not a member - - - template <class T1, class T2> --pair<T1, T2> make_pair(const T1& x, const T2& x) -+pair<T1,T2> make_pair(const T1& x, const T2& x) - - - ---- stl-manual-3.30.orig/logical_or.html -+++ stl-manual-3.30/logical_or.html -@@ -147,7 +147,7 @@ The type of the result: bool - - - --bool operator()(const T& x, const T& y) const -+bool operator()(const T& x, const T& y) const - - - Binary Function -@@ -158,7 +158,7 @@ Function call operator. The return valu - - - --logical_or() -+logical_or() - - - Default Constructible ---- stl-manual-3.30.orig/temporary_buffer.html -+++ stl-manual-3.30/temporary_buffer.html -@@ -162,7 +162,7 @@ Description - - - --temporary_buffer(ForwardIterator first, -+temporary_buffer(ForwardIterator first, - ForwardIterator last) - - -@@ -175,7 +175,7 @@ valid range. - - - --~temporary_buffer() -+~temporary_buffer() - - - Destroys the elements in the temporary buffer, and deallocates -@@ -184,7 +184,7 @@ the buffer itself. - - - --T* begin() -+T* begin() - - - Returns a pointer to the first element in the buffer. -@@ -192,7 +192,7 @@ Returns a pointer to the first element i - - - --T* end() -+T* end() - - - Returns a pointer that points one past the last element -@@ -201,7 +201,7 @@ in the buffer. - - - --ptrdiff_t requested_size() const -+ptrdiff_t requested_size() const - - - Returns the value last - first, where first and last are -@@ -210,12 +210,12 @@ the arguments that were passed to the co - - - --ptrdiff_t size() const -+ptrdiff_t size() const - - - Returns the number of elements in the temporary buffer, --end() - begin(). The return value satisfies the constraint --0 <= size() <= requested_size(). -+end()- begin(). The return value satisfies the constraint -+0<= size() <= requested_size(). - - - ---- stl-manual-3.30.orig/select1st.html -+++ stl-manual-3.30/select1st.html -@@ -140,7 +140,7 @@ The type of the result: Pair::first_ - - - const Pair::first_type& --operator()(const Pair& p) const -+operator()(const Pair& p) const - - - ---- stl-manual-3.30.orig/insert_iterator.html -+++ stl-manual-3.30/insert_iterator.html -@@ -185,7 +185,7 @@ Description - - - --insert_iterator(Container&, Container::iterator) -+insert_iterator(Container&, Container::iterator) - - - insert_iterator -@@ -196,7 +196,7 @@ See below. - - - --insert_iterator(const insert_iterator&) -+insert_iterator(const insert_iterator&) - - - Trivial Iterator -@@ -207,7 +207,7 @@ The copy constructor - - - --insert_iterator& operator=(const insert_iterator&) -+insert_iterator& operator=(const insert_iterator&) - - - Trivial Iterator -@@ -218,7 +218,7 @@ The assignment operator - - - --insert_iterator& operator*() -+insert_iterator& operator*() - - - Output Iterator -@@ -229,7 +229,7 @@ Used to implement the Output Iterator -@@ -240,7 +240,7 @@ Used to implement the Output Iterator -@@ -251,7 +251,7 @@ Preincrement. - - - --insert_iterator& operator++(int) -+insert_iterator& operator++(int) - - - Output Iterator -@@ -262,7 +262,7 @@ Postincrement. - - - --output_iterator_tag iterator_category(const insert_iterator&) -+output_iterator_tag iterator_category(const insert_iterator&) - - - iterator tags -@@ -277,7 +277,7 @@ Returns the iterator's category. - - template<class Container, class Iter) - insert_iterator<Container> --inserter(Container& C, Iter i); -+inserter(Container& C, Iter i); - - - -@@ -303,7 +303,7 @@ Description - - - --insert_iterator(Container& C, Container::iterator i) -+insert_iterator(Container& C, Container::iterator i) - - - Constructs an insert_iterator that inserts objects in C. -@@ -320,11 +320,11 @@ Constructs an insert_iterator t - - template<class Container, class Iter) - insert_iterator<Container> --inserter(Container& C, Iter i); -+inserter(Container& C, Iter i); - - - --Equivalent to insert_iterator<Container>(C, i). [2] -+Equivalentto insert_iterator<Container>(C, i). [2] - This is a global function, not a member function. - - ---- stl-manual-3.30.orig/mem_fun1_ref_t.html -+++ stl-manual-3.30/mem_fun1_ref_t.html -@@ -216,7 +216,7 @@ The type of the result: Result - - - --Result operator()(X& x, Arg a) const -+Result operator()(X& x, Arg a) const - - - -@@ -230,7 +230,7 @@ Function call operator. Invokes x.f - - - --explicit mem_fun1_ref_t(Result (X::*f)(Arg)) -+explicit mem_fun1_ref_t(Result (X::*f)(Arg)) - - - -@@ -245,7 +245,7 @@ See below. - - template <class Result, class X, class Arg> - mem_fun1_ref_t<Result, X, Arg> --mem_fun_ref(Result (X::*f)(Arg)); [2] -+mem_fun_ref(Result (X::*f)(Arg)); [2] - - - -@@ -273,7 +273,7 @@ Description - - - --explicit mem_fun1_ref_t(Result (X::*f)(Arg)) -+explicit mem_fun1_ref_t(Result (X::*f)(Arg)) - - - -@@ -286,7 +286,7 @@ The constructor. Creates a mem_fun1 - - template <class Result, class X, class Arg> - mem_fun1_ref_t<Result, X, Arg> --mem_fun1_ref(Result (X::*f)(Arg)); [2] -+mem_fun1_ref(Result (X::*f)(Arg)); [2] - - - ---- stl-manual-3.30.orig/hash_set.html -+++ stl-manual-3.30/hash_set.html -@@ -311,13 +311,13 @@ Iterator used to iterate through a h - Container - - --Const iterator used to iterate through a hash_set. (Iterator and -+Const iterator used to iterate through a hash_set. (Iterator and - const_iterator are the same type.) - - - - --iterator begin() const -+iterator begin() const - - - Container -@@ -328,7 +328,7 @@ Returns an iterator pointing to - - - --iterator end() const -+iterator end() const - - - Container -@@ -339,7 +339,7 @@ Returns an iterator pointing to - - - --size_type size() const -+size_type size() const - - - Container -@@ -350,7 +350,7 @@ Returns the size of the hash_set - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -361,7 +361,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -372,7 +372,7 @@ Returns the largest possible size of the - - - --size_type bucket_count() const -+size_type bucket_count() const - - - Hashed Associative Container -@@ -383,7 +383,7 @@ Returns the number of buckets used by th - - - --void resize(size_type n) -+void resize(size_type n) - - - Hashed Associative Container -@@ -394,7 +394,7 @@ Increases the bucket count to at least < - - - --hasher hash_funct() const -+hasher hash_funct() const - - - Hashed Associative Container -@@ -405,7 +405,7 @@ Returns the hasher object used - - - --key_equal key_eq() const -+key_equal key_eq() const - - - Hashed Associative Container -@@ -416,7 +416,7 @@ Returns the key_equal object us - - - --hash_set() -+hash_set() - - - Container -@@ -427,7 +427,7 @@ Creates an empty hash_set. - - - --hash_set(size_type n) -+hash_set(size_type n) - - - Hashed Associative Container -@@ -439,7 +439,7 @@ Creates an empty hash_set with - - - --hash_set(size_type n, -+hash_set(size_type n, - const hasher& h) - - -@@ -454,7 +454,7 @@ Creates an empty hash_set with - - - --hash_set(size_type n, -+hash_set(size_type n, - const hasher& h, - const key_equal& k) - -@@ -471,7 +471,7 @@ Creates an empty hash_set with - - - template <class InputIterator> --hash_set(InputIterator f, InputIterator l) -+hash_set(InputIterator f, InputIterator l) - [1] - - -@@ -486,7 +486,7 @@ Creates a hash_set with a copy of a rang - - - template <class InputIterator> --hash_set(InputIterator f, InputIterator l, -+hash_set(InputIterator f, InputIterator l, - size_type n) - [1] - -@@ -503,7 +503,7 @@ Creates a hash_set with a copy of a rang - - - template <class InputIterator> --hash_set(InputIterator f, InputIterator l, -+hash_set(InputIterator f, InputIterator l, - size_type n, const hasher& h) - [1] - -@@ -519,7 +519,7 @@ Creates a hash_set with a copy of a rang - - - --hash_set(InputIterator f, InputIterator l, -+hash_set(InputIterator f, InputIterator l, - size_type n, const hasher& h, - const key_equal& k) - [1] -@@ -536,7 +536,7 @@ Creates a hash_set with a copy of a rang - - - --hash_set(const hash_set&) -+hash_set(const hash_set&) - - - Container -@@ -547,7 +547,7 @@ The copy constructor. - - - --hash_set& operator=(const hash_set&) -+hash_set& operator=(const hash_set&) - - - Container -@@ -558,7 +558,7 @@ The assignment operator - - - --void swap(hash_set&) -+void swap(hash_set&) - - - Container -@@ -571,7 +571,7 @@ Swaps the contents of two hash_sets. - - - pair<iterator, bool> --insert(const value_type& x) -+insert(const value_type& x) - - - -@@ -585,7 +585,7 @@ Inserts x into the hash_set - - - template <class InputIterator> --void insert(InputIterator f, InputIterator l) -+void insert(InputIterator f, InputIterator l) - [1] - - -@@ -598,7 +598,7 @@ Inserts a range into the hash_set - - --void erase(iterator pos) -+void erase(iterator pos) - - - Associative Container -@@ -609,7 +609,7 @@ Erases the element pointed to by pos - - - --size_type erase(const key_type& k) -+size_type erase(const key_type& k) - - - Associative Container -@@ -620,7 +620,7 @@ Erases the element whose key is k - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Associative Container -@@ -631,7 +631,7 @@ Erases all elements in a range. - - - --void clear() -+void clear() - - - Associative Container -@@ -642,7 +642,7 @@ Erases all of the elements. - - - --iterator find(const key_type& k) const -+iterator find(const key_type& k) const - - - Associative Container -@@ -653,7 +653,7 @@ Finds an element whose key is k - - - --size_type count(const key_type& k) const -+size_type count(const key_type& k) const - - - Unique Associative Container -@@ -666,7 +666,7 @@ Counts the number of elements whose key - - - pair<iterator, iterator> --equal_range(const key_type& k) const -+equal_range(const key_type& k) const - - - -@@ -679,7 +679,7 @@ Finds a range containing all elements wh - - - --bool operator==(const hash_set&, -+bool operator==(const hash_set&, - const hash_set&) - - ---- stl-manual-3.30.orig/subtractive_rng.html -+++ stl-manual-3.30/subtractive_rng.html -@@ -114,7 +114,7 @@ The type of the result: unsigned int - - - --subtractive_rng(unsigned int seed) -+subtractive_rng(unsigned int seed) - - - subtractive_rng -@@ -125,7 +125,7 @@ See below. - - - --subtractive_rng() -+subtractive_rng() - - - subtractive_rng -@@ -136,7 +136,7 @@ See below. - - - --unsigned int operator()(unsigned int N) -+unsignedint operator()(unsigned int N) - - - Adaptable Unary Function -@@ -148,7 +148,7 @@ Function call. Returns a pseudo-random - - - --void initialize(unsigned int seed) -+void initialize(unsigned int seed) - - - subtractive_rng -@@ -174,7 +174,7 @@ Description - - - --subtractive_rng(unsigned int seed) -+subtractive_rng(unsigned int seed) - - - The constructor. Creates a subtractive_rng whose internal state -@@ -183,7 +183,7 @@ The constructor. Creates a subtract - - - --subtractive_rng() -+subtractive_rng() - - - The default constructor. Creates a subtractive_rng initialized -@@ -192,7 +192,7 @@ The default constructor. Creates a - - - --void initialize(unsigned int seed) -+void initialize(unsigned int seed) - - - Re-initializes the internal state of the subtractive_rng, using ---- stl-manual-3.30.orig/less.html -+++ stl-manual-3.30/less.html -@@ -144,7 +144,7 @@ The type of the result: bool - - - --less() -+less() - - - DefaultConstructible -@@ -155,7 +155,7 @@ The default constructor. - - - --bool operator()(const T& x, const T& y) -+bool operator()(const T& x, const T& y) - - - Binary Function ---- stl-manual-3.30.orig/modulus.html -+++ stl-manual-3.30/modulus.html -@@ -151,7 +151,7 @@ The type of the result: T - - - --T operator()(const T& x, const T& y) -+T operator()(const T& x, const T& y) - - - Adaptable Binary Function -@@ -162,7 +162,7 @@ Function call operator. The return valu - - - --modulus() -+modulus() - - - Default Constructible ---- stl-manual-3.30.orig/queue.html -+++ stl-manual-3.30/queue.html -@@ -185,7 +185,7 @@ See below. - - - --queue() -+queue() - - - Default Constructible -@@ -196,7 +196,7 @@ The default constructor. Creates an emp - - - --queue(const queue&) -+queue(const queue&) - - - Assignable -@@ -207,7 +207,7 @@ The copy constructor. - - - --queue& operator=(const queue&) -+queue& operator=(const queue&) - - - Assignable -@@ -218,7 +218,7 @@ The assignment operator. - - - --bool empty() const -+bool empty() const - - - queue -@@ -229,7 +229,7 @@ See below. - - - --size_type size() const -+size_type size() const - - - queue -@@ -240,7 +240,7 @@ See below. - - - --value_type& front() -+value_type& front() - - - queue -@@ -251,7 +251,7 @@ See below. - - - --const value_type& front() const -+const value_type& front() const - - - queue -@@ -262,7 +262,7 @@ See below. - - - --value_type& back() -+value_type& back() - - - queue -@@ -273,7 +273,7 @@ See below. - - - --const value_type& back() const -+const value_type& back() const - - - queue -@@ -284,7 +284,7 @@ See below. - - - --void push(const value_type&) -+void push(const value_type&) - - - queue -@@ -295,7 +295,7 @@ See below. - - - --void pop() [3] -+void pop() [3] - - - queue -@@ -306,7 +306,7 @@ See below. - - - --bool operator==(const queue&, const queue&) -+bool operator==(const queue&, const queue&) - - - queue -@@ -317,7 +317,7 @@ See below. - - - --bool operator<(const queue&, const queue&) -+bool operator<(const queue&, const queue&) - - - queue -@@ -360,7 +360,7 @@ An unsigned integral type. This is the - - - --bool empty() const -+bool empty() const - - - Returns true if the queue contains no elements, and false -@@ -369,7 +369,7 @@ Returns true if the queue - - --size_type size() const -+size_type size() const - - - Returns the number of elements contained in the queue. -@@ -377,7 +377,7 @@ Returns the number of elements contained - - - --value_type& front() -+value_type& front() - - - Returns a mutable reference to the element at the front of the -@@ -387,7 +387,7 @@ Returns a mutable reference to the eleme - - - --const value_type& front() const -+const value_type& front() const - - - Returns a const reference to the element at the front of the -@@ -397,7 +397,7 @@ Returns a const reference to the element - - - --value_type& back() -+value_type& back() - - - Returns a mutable reference to the element at the back of the -@@ -407,7 +407,7 @@ Returns a mutable reference to the eleme - - - --const value_type& back() const -+const value_type& back() const - - - Returns a const reference to the element at the back of the -@@ -417,7 +417,7 @@ Returns a const reference to the element - - - --void push(const value_type& x) -+void push(const value_type& x) - - - Inserts x at the back of the queue. Postconditions: size() will -@@ -426,7 +426,7 @@ Inserts x at the back of the qu - - - --void pop() -+void pop() - - - Removes the element at the front of the queue. [3] Precondition: -@@ -436,7 +436,7 @@ Removes the element at the front of the - - - --bool operator==(const queue&, const queue&) -+bool operator==(const queue&, const queue&) - - - Compares two queues for equality. Two queues are equal if they -@@ -446,7 +446,7 @@ Compares two queues for equality. Two q - - - --bool operator<(const queue&, const queue&) -+bool operator<(const queue&, const queue&) - - - Lexicographical ordering of two queues. ---- stl-manual-3.30.orig/front_insert_iterator.html -+++ stl-manual-3.30/front_insert_iterator.html -@@ -117,7 +117,7 @@ Description - - - --front_insert_iterator(FrontInsertionSequence&) -+front_insert_iterator(FrontInsertionSequence&) - - - front_insert_iterator -@@ -128,7 +128,7 @@ See below. - - - --front_insert_iterator(const front_insert_iterator&) -+front_insert_iterator(const front_insert_iterator&) - - - Trivial Iterator -@@ -141,7 +141,7 @@ The copy constructor - - - front_insert_iterator& --operator=(const front_insert_iterator&) -+operator=(const front_insert_iterator&) - - - -@@ -153,7 +153,7 @@ The assignment operator - - - --front_insert_iterator& operator*() -+front_insert_iterator& operator*() - - - Output Iterator -@@ -166,7 +166,7 @@ Used to implement the - - --front_insert_iterator& operator++() -+front_insert_iterator& operator++() - - - Output Iterator -@@ -189,7 +189,7 @@ Preincrement. - - - --front_insert_iterator& operator++(int) -+front_insert_iterator& operator++(int) - - - Output Iterator -@@ -202,7 +202,7 @@ Postincrement. - - - output_iterator_tag --iterator_category(const front_insert_iterator&) -+iterator_category(const front_insert_iterator&) - - - -@@ -218,7 +218,7 @@ Returns the iterator's category. - - template<class FrontInsertionSequence> - front_insert_iterator<FrontInsertionSequence> --front_inserter(FrontInsertionSequence& S) -+front_inserter(FrontInsertionSequence& S) - - - -@@ -244,7 +244,7 @@ Description - - - --front_insert_iterator(FrontInsertionSequence& S) -+front_insert_iterator(FrontInsertionSequence& S) - - - Constructs a front_insert_iterator that inserts objects -@@ -256,7 +256,7 @@ Constructs a front_insert_iterator - template<class FrontInsertionSequence> - front_insert_iterator<FrontInsertionSequence> --front_inserter(FrontInsertionSequence& S); -+front_inserter(FrontInsertionSequence& S); - - - ---- stl-manual-3.30.orig/project1st.html -+++ stl-manual-3.30/project1st.html -@@ -159,7 +159,7 @@ The type of the result: Arg1. - - - --Arg1 operator()(const Arg1& x, const Arg2&) const -+Arg1 operator()(const Arg1& x, const Arg2&) const - - - Adaptable Binary Function ---- stl-manual-3.30.orig/Vector.html -+++ stl-manual-3.30/Vector.html -@@ -234,7 +234,7 @@ Const iterator used to iterate backwards - - - --iterator begin() -+iterator begin() - - - Container -@@ -245,7 +245,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -256,7 +256,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -267,7 +267,7 @@ Returns a const_iterator pointi - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -278,7 +278,7 @@ Returns a const_iterator pointi - - - --reverse_iterator rbegin() -+reverse_iterator rbegin() - - - Reversible Container -@@ -290,7 +290,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() -+reverse_iterator rend() - - - Reversible Container -@@ -302,7 +302,7 @@ Returns a reverse_iterator poin - - - --const_reverse_iterator rbegin() const -+const_reverse_iterator rbegin() const - - - Reversible Container -@@ -314,7 +314,7 @@ Returns a const_reverse_iterator - - --const_reverse_iterator rend() const -+const_reverse_iterator rend() const - - - Reversible Container -@@ -326,7 +326,7 @@ Returns a const_reverse_iterator - - --size_type size() const -+size_type size() const - - - Container -@@ -337,7 +337,7 @@ Returns the size of the vector. - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -348,7 +348,7 @@ Returns the largest possible size of the - - - --size_type capacity() const -+size_type capacity() const - - - vector -@@ -359,7 +359,7 @@ See below. - - - --bool empty() const -+bool empty() const - - - Container -@@ -370,7 +370,7 @@ See below. - - - --reference operator[](size_type n) -+reference operator[](size_type n) - - - Random Access Container -@@ -381,7 +381,7 @@ Returns the n'th element. - - - --const_reference operator[](size_type n) const -+const_reference operator[](size_type n) const - - - Random Access Container -@@ -392,7 +392,7 @@ Returns the n'th element. - - - --vector() -+vector() - - - Container -@@ -403,7 +403,7 @@ Creates an empty vector. - - - --vector(size_type n) -+vector(size_type n) - - - Sequence -@@ -414,7 +414,7 @@ Creates a vector with n element - - - --vector(size_type n, const T& t) -+vector(size_type n, const T& t) - - - Sequence -@@ -425,7 +425,7 @@ Creates a vector with n copies - - - --vector(const vector&) -+vector(const vector&) - - - Container -@@ -438,7 +438,7 @@ The copy constructor. - - - template <class InputIterator> --vector(InputIterator, InputIterator) -+vector(InputIterator, InputIterator) - [1] - - -@@ -451,7 +451,7 @@ Creates a vector with a copy of a range. - - - --~vector() -+~vector() - - - Container -@@ -462,7 +462,7 @@ The destructor. - - - --vector& operator=(const vector&) -+vector& operator=(const vector&) - - - Container -@@ -473,7 +473,7 @@ The assignment operator - - - --void reserve(size_t) -+void reserve(size_t) - - - vector -@@ -484,7 +484,7 @@ See below. - - - --reference front() -+reference front() - - - Sequence -@@ -495,7 +495,7 @@ Returns the first element. - - - --const_reference front() const -+const_reference front() const - - - Sequence -@@ -506,7 +506,7 @@ Returns the first element. - - - --reference back() -+reference back() - - - Back Insertion Sequence -@@ -517,7 +517,7 @@ Returns the last element. - - - --const_reference back() const -+const_reference back() const - - - Back Insertion Sequence -@@ -528,7 +528,7 @@ Returns the last element. - - - --void push_back(const T&) -+void push_back(const T&) - - - Back Insertion Sequence -@@ -539,7 +539,7 @@ Inserts a new element at the end. - - - --void pop_back() -+void pop_back() - - - Back Insertion Sequence -@@ -550,7 +550,7 @@ Removes the last element. - - - --void swap(vector&) -+void swap(vector&) - - - Container -@@ -562,7 +562,7 @@ Swaps the contents of two vectors. - - - --iterator insert(iterator pos, -+iterator insert(iterator pos, - const T& x) - - -@@ -577,7 +577,7 @@ Inserts x before pos. - - - template <class InputIterator> --void insert(iterator pos, -+void insert(iterator pos, - InputIterator f, InputIterator l) - [1] - -@@ -592,7 +592,7 @@ Inserts the range [first, last) - - - --void insert(iterator pos, -+void insert(iterator pos, - size_type n, const T& x) - - -@@ -605,7 +605,7 @@ Inserts n copies of x - - - --iterator erase(iterator pos) -+iterator erase(iterator pos) - - - Sequence -@@ -616,7 +616,7 @@ Erases the element at position pos - - --iterator erase(iterator first, iterator last) -+iterator erase(iterator first, iterator last) - - - Sequence -@@ -627,7 +627,7 @@ Erases the range [first, last) - - - --void clear() -+void clear() - - - Sequence -@@ -638,7 +638,7 @@ Erases all of the elements. - - - --void resize(n, t = T()) -+void resize(n, t = T()) - - - Sequence -@@ -650,7 +650,7 @@ Inserts or erases elements at the end su - - - --bool operator==(const vector&, -+bool operator==(const vector&, - const vector&) - - -@@ -665,7 +665,7 @@ Tests two vectors for equality. This is - - - --bool operator<(const vector&, -+bool operator<(const vector&, - const vector&) - - -@@ -694,7 +694,7 @@ Description - - - --size_type capacity() const -+size_type capacity() const - - - Number of elements for which memory has been allocated. -@@ -704,7 +704,7 @@ Number of elements for which memory has - - - --void reserve(size_type n) -+void reserve(size_type n) - - - If n is less than or equal to capacity(), this call has no effect. ---- stl-manual-3.30.orig/unary_compose.html -+++ stl-manual-3.30/unary_compose.html -@@ -170,7 +170,7 @@ The type of the result: AdaptableUna - - - --unary_compose(const AdaptableUnaryFunction1& f, -+unary_compose(const AdaptableUnaryFunction1& f, - const AdaptableUnaryFunction2& g); - - -@@ -186,7 +186,7 @@ See below. - - template <class AdaptableUnaryFunction1, class AdaptableUnaryFunction2> - unary_compose<AdaptableUnaryFunction1, AdaptableUnaryFunction2> --compose1(const AdaptableUnaryFunction1& op1, -+compose1(const AdaptableUnaryFunction1& op1, - const AdaptableUnaryFunction2& op2); - - -@@ -215,7 +215,7 @@ Description - - - --unary_compose(const AdaptableUnaryFunction1& f, -+unary_compose(const AdaptableUnaryFunction1& f, - const AdaptableUnaryFunction2& g); - - -@@ -229,15 +229,15 @@ the function object f o g. - template <class AdaptableUnaryFunction1, class AdaptableUnaryFunction2> - unary_compose<AdaptableUnaryFunction1, AdaptableUnaryFunction2> --compose1(const AdaptableUnaryFunction1& op1, -+compose1(const AdaptableUnaryFunction1& op1, - const AdaptableUnaryFunction2& op2); - - - - Creates a unary_compose object. If f and g are, respectively, of classes - AdaptableUnaryFunction1 and AdaptableUnaryFunction2, then --compose1(f, g) is equivalent to --unary_compose<AdaptableUnaryFunction1, AdaptableUnaryFunction2>(f, g), -+compose1(f, g) is equivalent to -+unary_compose<AdaptableUnaryFunction1, AdaptableUnaryFunction2>(f, g), - but is more convenient. This is a global function, not a member function. - - ---- stl-manual-3.30.orig/Multimap.html -+++ stl-manual-3.30/Multimap.html -@@ -342,7 +342,7 @@ Const iterator used to iterate backwards - - - --iterator begin() -+iterator begin() - - - Container -@@ -353,7 +353,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -364,7 +364,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -375,7 +375,7 @@ Returns a const_iterator pointi - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -386,7 +386,7 @@ Returns a const_iterator pointi - - - --reverse_iterator rbegin() -+reverse_iterator rbegin() - - - Reversible Container -@@ -398,7 +398,7 @@ Returns a reverse_iterator poin - - - --reverse_iterator rend() -+reverse_iterator rend() - - - Reversible Container -@@ -410,7 +410,7 @@ Returns a reverse_iterator poin - - - --const_reverse_iterator rbegin() const -+const_reverse_iterator rbegin() const - - - Reversible Container -@@ -422,7 +422,7 @@ Returns a const_reverse_iterator - - --const_reverse_iterator rend() const -+const_reverse_iterator rend() const - - - Reversible Container -@@ -434,7 +434,7 @@ Returns a const_reverse_iterator - - --size_type size() const -+size_type size() const - - - Container -@@ -445,7 +445,7 @@ Returns the size of the multimap - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -456,7 +456,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -467,7 +467,7 @@ Returns the largest possible size of the - - - --key_compare key_comp() const -+key_compare key_comp() const - - - Sorted Associative Container -@@ -478,7 +478,7 @@ Returns the key_compare object - - - --value_compare value_comp() const -+value_compare value_comp() const - - - Sorted Associative Container -@@ -489,7 +489,7 @@ Returns the value_compare objec - - - --multimap() -+multimap() - - - Container -@@ -500,7 +500,7 @@ Creates an empty multimap. - - - --multimap(const key_compare& comp) -+multimap(const key_compare& comp) - - - Sorted Associative Container -@@ -513,7 +513,7 @@ Creates an empty multimap, usin - - - template <class InputIterator> --multimap(InputIterator f, InputIterator l) -+multimap(InputIterator f, InputIterator l) - [2] - - -@@ -528,7 +528,7 @@ Creates a multimap with a copy of a rang - - - template <class InputIterator> --multimap(InputIterator f, InputIterator l, -+multimap(InputIterator f, InputIterator l, - const key_compare& comp) - [2] - -@@ -543,7 +543,7 @@ Creates a multimap with a copy of a rang - - - --multimap(const multimap&) -+multimap(const multimap&) - - - Container -@@ -554,7 +554,7 @@ The copy constructor. - - - --multimap& operator=(const multimap&) -+multimap& operator=(const multimap&) - - - Container -@@ -565,7 +565,7 @@ The assignment operator - - - --void swap(multimap&) -+void swap(multimap&) - - - Container -@@ -576,7 +576,7 @@ Swaps the contents of two multimaps. - - - --iterator insert(const value_type& x) -+iterator insert(const value_type& x) - - - Multiple Associative Container -@@ -588,7 +588,7 @@ Inserts x into the multimap - - - --iterator insert(iterator pos, -+iterator insert(iterator pos, - const value_type& x) - - -@@ -604,7 +604,7 @@ Inserts x into the multimap - - - template <class InputIterator> --void insert(InputIterator, InputIterator) -+void insert(InputIterator, InputIterator) - [2] - - -@@ -617,7 +617,7 @@ Inserts a range into the multimap - - --void erase(iterator pos) -+void erase(iterator pos) - - - Associative Container -@@ -628,7 +628,7 @@ Erases the element pointed to by pos - - - --size_type erase(const key_type& k) -+size_type erase(const key_type& k) - - - Associative Container -@@ -639,7 +639,7 @@ Erases the element whose key is k - - --void erase(iterator first, iterator last) -+void erase(iterator first, iterator last) - - - Associative Container -@@ -650,7 +650,7 @@ Erases all elements in a range. - - - --void clear() -+void clear() - - - Associative Container -@@ -661,7 +661,7 @@ Erases all of the elements. - - - --iterator find(const key_type& k) -+iterator find(const key_type& k) - - - Associative Container -@@ -672,7 +672,7 @@ Finds an element whose key is k - - - --const_iterator find(const key_type& k) const -+const_iterator find(const key_type& k) const - - - Associative Container -@@ -683,7 +683,7 @@ Finds an element whose key is k - - - --size_type count(const key_type& k) -+size_type count(const key_type& k) - - - Associative Container -@@ -694,7 +694,7 @@ Counts the number of elements whose key - - - --iterator lower_bound(const key_type& k) -+iterator lower_bound(const key_type& k) - - - Sorted Associative Container -@@ -705,7 +705,7 @@ Finds the first element whose key is not - - - --const_iterator lower_bound(const key_type& k) const -+const_iterator lower_bound(const key_type& k) const - - - Sorted Associative Container -@@ -716,7 +716,7 @@ Finds the first element whose key is not - - - --iterator upper_bound(const key_type& k) -+iterator upper_bound(const key_type& k) - - - Sorted Associative Container -@@ -727,7 +727,7 @@ Finds the first element whose key greate - - - --const_iterator upper_bound(const key_type& k) const -+const_iterator upper_bound(const key_type& k) const - - - Sorted Associative Container -@@ -740,7 +740,7 @@ Finds the first element whose key greate - - - pair<iterator, iterator> --equal_range(const key_type& k) -+equal_range(const key_type& k) - - - -@@ -754,7 +754,7 @@ Finds a range containing all elements wh - - - pair<const_iterator, const_iterator> --equal_range(const key_type& k) const -+equal_range(const key_type& k) const - - - -@@ -767,7 +767,7 @@ Finds a range containing all elements wh - - - --bool operator==(const multimap&, -+bool operator==(const multimap&, - const multimap&) - - -@@ -782,7 +782,7 @@ Tests two multimaps for equality. This - - - --bool operator<(const multimap&, -+bool operator<(const multimap&, - const multimap&) - - ---- stl-manual-3.30.orig/Slist.html -+++ stl-manual-3.30/Slist.html -@@ -257,7 +257,7 @@ Const iterator used to iterate through a - - - --iterator begin() -+iterator begin() - - - Container -@@ -268,7 +268,7 @@ Returns an iterator pointing to - - - --iterator end() -+iterator end() - - - Container -@@ -279,7 +279,7 @@ Returns an iterator pointing to - - - --const_iterator begin() const -+const_iterator begin() const - - - Container -@@ -290,7 +290,7 @@ Returns a const_iterator pointi - - - --const_iterator end() const -+const_iterator end() const - - - Container -@@ -301,7 +301,7 @@ Returns a const_iterator pointi - - - --size_type size() const -+size_type size() const - - - Container -@@ -316,7 +316,7 @@ Returns the size of the slist. - - - --size_type max_size() const -+size_type max_size() const - - - Container -@@ -327,7 +327,7 @@ Returns the largest possible size of the - - - --bool empty() const -+bool empty() const - - - Container -@@ -338,7 +338,7 @@ Returns the largest possible size of the - - - --slist() -+slist() - - - Container -@@ -349,7 +349,7 @@ Creates an empty slist. - - - --slist(size_type n) -+slist(size_type n) - - - Sequence -@@ -360,7 +360,7 @@ Creates an slist with n - - --slist(size_type n, const T& t) -+slist(size_type n, const T& t) - - - Sequence -@@ -371,7 +371,7 @@ Creates an slist with n copies - - - --slist(const slist&) -+slist(const slist&) - - - Container -@@ -384,7 +384,7 @@ The copy constructor. - - - template <class InputIterator> --slist(InputIterator f, InputIterator l) -+slist(InputIterator f, InputIterator l) - [3] - - -@@ -397,7 +397,7 @@ Creates an slist with a copy of - - - --~slist() -+~slist() - - - Container -@@ -408,7 +408,7 @@ The destructor. - - - --slist& operator=(const slist&) -+slist& operator=(const slist&) - - - Container -@@ -419,7 +419,7 @@ The assignment operator - - - --void swap(slist&) -+void swap(slist&) - - - Container -@@ -430,7 +430,7 @@ Swaps the contents of two slists. - - - --reference front() -+reference front() - - - Front Insertion Sequence -@@ -441,7 +441,7 @@ Returns the first element. - - - --const_reference front() const -+const_reference front() const - - - Front Insertion Sequence -@@ -452,7 +452,7 @@ Returns the first element. - - - --void push_front(const T&) -+void push_front(const T&) - - - Front Insertion Sequence -@@ -463,7 +463,7 @@ Inserts a new element at the beginning. - - - --void pop_front() -+void pop_front() - - - Front Insertion Sequence -@@ -474,7 +474,7 @@ Removes the first element. - - - --iterator previous(iterator pos) -+iterator previous(iterator pos) - - - slist -@@ -485,7 +485,7 @@ See below - - - --const_iterator previous(const_iterator pos) -+const_iterator previous(const_iterator pos) - - - slist -@@ -496,7 +496,7 @@ See below - - - --iterator insert(iterator pos, const T& x) -+iterator insert(iterator pos, const T& x) - - - Sequence -@@ -509,7 +509,7 @@ Inserts x before pos. - - - template<class InputIterator> --void insert(iterator pos, InputIterator f, InputIterator l) -+void insert(iterator pos, InputIterator f, InputIterator l) - [3] - - -@@ -523,7 +523,7 @@ Inserts the range [first, last) - - - --void insert(iterator pos, -+void insert(iterator pos, - size_type n, const value_type& x) - - -@@ -536,7 +536,7 @@ Inserts n copies of x - - - --iterator erase(iterator pos) -+iterator erase(iterator pos) - - - Sequence -@@ -547,7 +547,7 @@ Erases the element at position pos - - --iterator erase(iterator first, iterator last) -+iterator erase(iterator first, iterator last) - - - Sequence -@@ -558,7 +558,7 @@ Erases the range [first, last) - - - --void clear() -+void clear() - - - Sequence -@@ -569,7 +569,7 @@ Erases all of the elements. - - - --void resize(n, t = T()) -+void resize(n, t = T()) - - - Sequence -@@ -580,7 +580,7 @@ Inserts or erases elements at the end su - - - --iterator insert_after(iterator pos) -+iterator insert_after(iterator pos) - - - slist -@@ -591,7 +591,7 @@ See below. - - - --iterator insert_after(iterator pos, const value_type& x) -+iterator insert_after(iterator pos, const value_type& x) - - - slist -@@ -604,7 +604,7 @@ See below. - - - template<class InputIterator> --void insert_after(iterator pos, -+void insert_after(iterator pos, - InputIterator f, InputIterator l) - - -@@ -618,7 +618,7 @@ See below. - - - --void insert_after(iterator pos, -+void insert_after(iterator pos, - size_type n, const value_type& x) - - -@@ -631,7 +631,7 @@ See below. - - - --iterator erase_after(iterator pos) -+iterator erase_after(iterator pos) - - - slist -@@ -642,7 +642,7 @@ See below. - - - --iterator erase_after(iterator before_first, iterator last) -+iterator erase_after(iterator before_first, iterator last) - - - slist -@@ -653,7 +653,7 @@ See below. - - - --void splice(iterator position, slist& L) -+void splice(iterator position, slist& L) - - - slist -@@ -664,7 +664,7 @@ See below. - - - --void splice(iterator position, slist& L, iterator i) -+void splice(iterator position, slist& L, iterator i) - - - slist -@@ -675,7 +675,7 @@ See below. - - - --void splice(iterator position, slist& L, iterator f, iterator l) -+void splice(iterator position, slist& L, iterator f, iterator l) - - - slist -@@ -686,7 +686,7 @@ See below. - - - --void splice_after(iterator pos, iterator prev) -+void splice_after(iterator pos, iterator prev) - - - slist -@@ -698,7 +698,7 @@ See below. - - - --void splice_after(iterator pos, -+void splice_after(iterator pos, - iterator before_first, - iterator before_last) - -@@ -712,7 +712,7 @@ See below. - - - --void remove(const T& value) -+void remove(const T& value) - - - slist -@@ -723,7 +723,7 @@ See below. - - - --void unique() -+void unique() - - - slist -@@ -734,7 +734,7 @@ See below. - - - --void merge(slist& L) -+void merge(slist& L) - - - slist -@@ -745,7 +745,7 @@ See below. - - - --void sort() -+void sort() - - - slist -@@ -757,7 +757,7 @@ See below. - - - --bool operator==(const slist&, -+bool operator==(const slist&, - const slist&) - - -@@ -772,7 +772,7 @@ Tests two slists for equality. This is - - - --bool operator<(const slist&, -+bool operator<(const slist&, - const slist&) - - -@@ -799,7 +799,7 @@ Description - - - --iterator previous(iterator pos) -+iterator previous(iterator pos) - - - pos must be a valid iterator in *this. The return value is -@@ -809,7 +809,7 @@ Description - - - --const_iterator previous(const_iterator pos) -+const_iterator previous(const_iterator pos) - - - pos must be a valid iterator in *this. The return value is -@@ -819,7 +819,7 @@ Description - - - --iterator insert_after(iterator pos) -+iterator insert_after(iterator pos) - - - pos must be a dereferenceable iterator in *this. (That is, -@@ -831,7 +831,7 @@ Description - - - --iterator insert_after(iterator pos, -+iterator insert_after(iterator pos, - const value_type& x) - - -@@ -846,7 +846,7 @@ iterator insert_after(iterator pos, - - - template<class InputIterator> --void insert_after(iterator pos, -+void insert_after(iterator pos, - InputIterator f, InputIterator l) - - -@@ -858,7 +858,7 @@ Inserts elements from the range [f, - - - --void insert_after(iterator pos, -+void insert_after(iterator pos, - size_type n, const value_type& x) - - -@@ -869,7 +869,7 @@ Inserts n copies of x - - - --iterator erase_after(iterator pos) -+iterator erase_after(iterator pos) - - - Erases the element pointed to by the iterator following pos. -@@ -878,7 +878,7 @@ Erases the element pointed to by the ite - - - --iterator erase_after(iterator before_first, iterator last) -+iterator erase_after(iterator before_first, iterator last) - - - Erases all elements in the range [before_first + 1, last). -@@ -888,7 +888,7 @@ Erases all elements in the range [be - - - --void splice(iterator position, -+void splice(iterator position, - slist<T, Alloc>& x); - - -@@ -905,7 +905,7 @@ void splice(iterator position, - - - --void splice(iterator position, -+void splice(iterator position, - slist<T, Alloc>& x, - iterator i); - -@@ -924,7 +924,7 @@ void splice(iterator position, - - - --void splice(iterator position, -+void splice(iterator position, - slist<T, Alloc>& x, - iterator f, iterator l); - -@@ -942,7 +942,7 @@ void splice(iterator position, - - - --void remove(const T& val); -+void remove(const T& val); - - - Removes all elements that compare equal to val. The relative order -@@ -953,7 +953,7 @@ Removes all elements that compare equal - - - --void splice_after(iterator pos, iterator prev) -+void splice_after(iterator pos, iterator prev) - - - pos must be a dereferenceable iterator in *this, and prev -@@ -967,7 +967,7 @@ Removes all elements that compare equal - - - --void splice_after(iterator pos, -+void splice_after(iterator pos, - iterator before_first, - iterator before_last) - -@@ -986,7 +986,7 @@ void splice_after(iterator pos, - - - template<class Predicate> --void remove_if(Predicate p); -+void remove_if(Predicate p); - [5] - - -@@ -999,7 +999,7 @@ Removes all elements *i such th - - - --void unique(); -+void unique(); - - - Removes all but the first element in every consecutive group of -@@ -1013,7 +1013,7 @@ Removes all but the first element in eve - - - template<class BinaryPredicate> --void unique(BinaryPredicate p); -+void unique(BinaryPredicate p); - [5] - - -@@ -1029,7 +1029,7 @@ Removes all but the first element in eve - - - --void merge(slist<T, Alloc>& x); -+void merge(slist<T, Alloc>& x); - - - Both *this and x must be sorted according to operator<, and -@@ -1047,7 +1047,7 @@ Both *this and x must - - - template<class BinaryPredicate> --void merge(slist<T, Alloc>& x, -+void merge(slist<T, Alloc>& x, - BinaryPredicate Comp); - [5] - -@@ -1069,7 +1069,7 @@ void merge(slist<T, Alloc>& x, - - - --void reverse(); -+void reverse(); - - - Reverses the order of elements in the slist. All iterators remain -@@ -1079,7 +1079,7 @@ Reverses the order of elements in the sl - - - --void sort(); -+void sort(); - - - Sorts *this according to operator<. The sort is stable, that is, -@@ -1094,7 +1094,7 @@ Sorts *this according to op - - - template<class BinaryPredicate> --void sort(BinaryPredicate comp); -+void sort(BinaryPredicate comp); - [5] - - diff -Nru stl-manual-3.30/debian/patches/debian-changes-3.30-12 stl-manual-3.30/debian/patches/debian-changes-3.30-12 --- stl-manual-3.30/debian/patches/debian-changes-3.30-12 1970-01-01 00:00:00.000000000 +0000 +++ stl-manual-3.30/debian/patches/debian-changes-3.30-12 2010-12-22 04:27:11.000000000 +0000 @@ -0,0 +1,11792 @@ +Description: Upstream changes introduced in version 3.30-12 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + stl-manual (3.30-12) unstable; urgency=low + . + * Bump Standards-Version to 3.9.1 + * Bump debhelper compatibility to 8 + . + The person named in the Author field signed this changelog entry. +Author: Francois Marier + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- stl-manual-3.30.orig/logical_not.html ++++ stl-manual-3.30/logical_not.html +@@ -132,7 +132,7 @@ The type of the result: bool + + + +-bool operator()(const T& x) const ++bool operator()(const T& x) const + + + Unary Function +@@ -143,7 +143,7 @@ Function call operator. The return valu + + + +-logical_not() ++logical_not() + + + Default Constructible +--- stl-manual-3.30.orig/char_producer.html ++++ stl-manual-3.30/char_producer.html +@@ -182,7 +182,7 @@ Description + + + +-virtual ~char_producer() ++virtual ~char_producer() + + + char_producer +--- stl-manual-3.30.orig/ReverseBidirectionalIterator.html ++++ stl-manual-3.30/ReverseBidirectionalIterator.html +@@ -196,7 +196,7 @@ See below + + + +-reverse_bidirectional_iterator() ++reverse_bidirectional_iterator() + + + Trivial Iterator +@@ -207,7 +207,7 @@ The default constructor + + + +-reverse_bidirectional_iterator(const reverse_bidirectional_iterator& x) ++reverse_bidirectional_iterator(const reverse_bidirectional_iterator& x) + + + Trivial Iterator +@@ -218,7 +218,7 @@ The copy constructor + + + +-reverse_bidirectional_iterator& operator=(const reverse_bidirectional_iterator& x) ++reverse_bidirectional_iterator& operator=(const reverse_bidirectional_iterator& x) + + + Trivial Iterator +@@ -229,7 +229,7 @@ The assignment operator + + + +-reverse_bidirectional_iterator(BidirectionalIterator x) ++reverse_bidirectional_iterator(BidirectionalIterator x) + + + reverse_bidirectional_iterator +@@ -240,7 +240,7 @@ See below. + + + +-BidirectionalIterator base() ++BidirectionalIterator base() + + + reverse_bidirectional_iterator +@@ -251,7 +251,7 @@ See below. + + + +-Reference operator*() const ++Reference operator*() const + + + Trivial Iterator +@@ -262,7 +262,7 @@ The dereference operator + + + +-reverse_bidirectional_iterator& operator++() ++reverse_bidirectional_iterator& operator++() + + + Forward Iterator +@@ -273,7 +273,7 @@ Preincrement + + + +-reverse_bidirectional_iterator operator++(int) ++reverse_bidirectional_iterator operator++(int) + + + Forward Iterator +@@ -284,7 +284,7 @@ Postincrement + + + +-reverse_bidirectional_iterator& operator--() ++reverse_bidirectional_iterator& operator--() + + + Bidirectional Iterator +@@ -295,7 +295,7 @@ Predecrement + + + +-reverse_bidirectional_iterator operator--(int) ++reverse_bidirectional_iterator operator--(int) + + + Bidirectional Iterator +@@ -306,7 +306,7 @@ Postdecrement + + + +-bool operator==(const reverse_bidirectional_iterator&, const reverse_bidirectional_iterator&) ++bool operator==(const reverse_bidirectional_iterator&, const reverse_bidirectional_iterator&) + + + Trivial Iterator +@@ -318,7 +318,7 @@ Compares two iterators for equality. + + + +-bidirectional_iterator_tag iterator_category(const reverse_bidirectional_iterator&) ++bidirectional_iterator_tag iterator_category(const reverse_bidirectional_iterator&) + + + Iterator tags +@@ -330,7 +330,7 @@ Returns the iterator's category. + + + +-T* value_type(const reverse_bidirectional_iterator&) ++T* value_type(const reverse_bidirectional_iterator&) + + + Iterator tags +@@ -342,7 +342,7 @@ Returns the iterator's value type. + + + +-Distance* distance_type(const reverse_bidirectional_iterator&) ++Distance* distance_type(const reverse_bidirectional_iterator&) + + + Iterator tags +@@ -377,7 +377,7 @@ A typedef for reverse_bidirectional_ + + + +-BidirectionalIterator base() ++BidirectionalIterator base() + + + Returns the current value of the reverse_bidirectional_iterator's base iterator. +@@ -389,7 +389,7 @@ Returns the current value of the rev + + + +-reverse_bidirectional_iterator(BidirectionalIterator i) ++reverse_bidirectional_iterator(BidirectionalIterator i) + + + Constructs a reverse_bidirectional_iterator whose base iterator is i. +--- stl-manual-3.30.orig/select2nd.html ++++ stl-manual-3.30/select2nd.html +@@ -140,7 +140,7 @@ The type of the result: Pair::second + + + const Pair::second_type& +-operator()(const Pair& p) const ++operator()(const Pair& p) const + + + +--- stl-manual-3.30.orig/mem_fun_ref_t.html ++++ stl-manual-3.30/mem_fun_ref_t.html +@@ -195,7 +195,7 @@ The type of the result: Result + + + +-Result operator()(X& x) const ++Result operator()(X& x) const + + + +@@ -209,7 +209,7 @@ Function call operator. Invokes x.f + + + +-explicit mem_fun_ref_t(Result (X::*f)()) ++explicit mem_fun_ref_t(Result (X::*f)()) + + + +@@ -224,7 +224,7 @@ See below. + + template <class Result, class X> + mem_fun_ref_t<Result, X> +-mem_fun_ref(Result (X::*f)()); ++mem_fun_ref(Result (X::*f)()); + + + +@@ -252,7 +252,7 @@ Description + + + +-explicit mem_fun_ref_t(Result (X::*f)()) ++explicit mem_fun_ref_t(Result (X::*f)()) + + + +@@ -265,7 +265,7 @@ The constructor. Creates a mem_fun_ + + template <class Result, class X> + mem_fun_ref_t<Result, X> +-mem_fun_ref(Result (X::*f)()); ++mem_fun_ref(Result (X::*f)()); + + + +--- stl-manual-3.30.orig/negate.html ++++ stl-manual-3.30/negate.html +@@ -138,7 +138,7 @@ The type of the result: T + + + +-T operator()(const T& x) ++T operator()(const T& x) + + + Adaptable Unary Function +@@ -149,7 +149,7 @@ Function call operator. The return valu + + + +-negate() ++negate() + + + Default Constructible +--- stl-manual-3.30.orig/binary_compose.html ++++ stl-manual-3.30/binary_compose.html +@@ -192,7 +192,7 @@ The type of the result: AdaptableBin + + + +-binary_compose(const AdaptableBinaryFunction& f, ++binary_compose(const AdaptableBinaryFunction& f, + const AdaptableUnaryFunction1& g1, + const AdaptableUnaryFunction1& g2); + +@@ -213,7 +213,7 @@ template <class compose2(const AdaptableBinaryFunction&, + const AdaptableUnaryFunction1&, + const AdaptableUnaryFunction2&); + +--- stl-manual-3.30.orig/bitset.html ++++ stl-manual-3.30/bitset.html +@@ -139,7 +139,7 @@ A proxy class that acts as a reference t + + + +-bitset() ++bitset() + + + Default Constructible +@@ -150,10 +150,10 @@ The default constructor. All bits are i + + + +-bitset(unsigned long val) ++bitset(unsigned long val) + + +-bitset ++bitset + + + Conversion from unsigned long. +@@ -161,7 +161,7 @@ Conversion from unsigned long. + + + +-bitset(const bitset&) ++bitset(const bitset&) + + + Assignable +@@ -172,7 +172,7 @@ Copy constructor. + + + +-bitset& operator=(const bitset&) ++bitset& operator=(const bitset&) + + + Assignable +@@ -186,7 +186,7 @@ Assignment operator. + + template<class Char, class Traits, class Alloc> + explicit +-bitset(const basic_string<Char,Traits,Alloc>& s, ++bitset(const basic_string<Char,Traits,Alloc>& s, + size_t pos = 0, + size_t n = + basic_string<Char,Traits,Alloc>::npos) +@@ -201,7 +201,7 @@ Conversion from string. + + + +-bitset& operator&=(const bitset&) ++bitset& operator&=(const bitset&) + + + bitset +@@ -212,7 +212,7 @@ Bitwise and. + + + +-bitset& operator|=(const bitset&) ++bitset& operator|=(const bitset&) + + + bitset +@@ -223,7 +223,7 @@ Bitwise inclusive or. + + + +-bitset& operator^=(const bitset&) ++bitset& operator^=(const bitset&) + + + bitset +@@ -234,7 +234,7 @@ Bitwise exclusive or. + + + +-bitset& operator<<=(size_t) ++bitset& operator<<=(size_t) + + + bitset +@@ -245,7 +245,7 @@ Left shift. + + + +-bitset& operator>>=(size_t) ++bitset& operator>>=(size_t) + + + bitset +@@ -256,7 +256,7 @@ Right shift. + + + +-bitset operator<<(size_t n) const ++bitset operator<<(size_t n) const + + + bitset +@@ -267,7 +267,7 @@ Returns a copy of *this shifted + + + +-bitset operator>>(size_t n) const ++bitset operator>>(size_t n) const + + + bitset +@@ -278,7 +278,7 @@ Returns a copy of *this shifted + + + +-bitset& set() ++bitset& set() + + + bitset +@@ -289,7 +289,7 @@ Sets every bit. + + + +-bitset& flip() ++bitset& flip() + + + bitset +@@ -300,7 +300,7 @@ Flips the value of every bit. + + + +-bitset operator~() const ++bitset operator~() const + + + bitset +@@ -311,7 +311,7 @@ Returns a copy of *this with al + + + +-bitset& reset() ++bitset& reset() + + + bitset +@@ -322,7 +322,7 @@ Clears every bit. + + + +-bitset& set(size_t n, int val = 1) ++bitset& set(size_t n, int val = 1) + + + bitset +@@ -333,7 +333,7 @@ Sets bit n if val is n + + + +-bitset& reset(size_t n) ++bitset& reset(size_t n) + + + bitset +@@ -344,7 +344,7 @@ Clears bit n. + + + +-bitset flip(size_t n) ++bitset flip(size_t n) + + + bitset +@@ -355,7 +355,7 @@ Flips bit n. + + + +-size_t size() const ++size_t size() const + + + bitset +@@ -366,7 +366,7 @@ Returns N. + + + +-size_t count() const ++size_t count() const + + + bitset +@@ -377,7 +377,7 @@ Returns the number of bits that are set. + + + +-bool any() const ++bool any() const + + + bitset +@@ -388,7 +388,7 @@ Returns true if any bits are se + + + +-bool none() const ++bool none() const + + + bitset +@@ -399,7 +399,7 @@ Returns true if no bits are set + + + +-bool test(size_t n) const ++bool test(size_t n) const + + + bitset +@@ -410,7 +410,7 @@ Returns true if bit n + + + +-reference operator[](size_t n) ++reference operator[](size_t n) + + + bitset +@@ -421,7 +421,7 @@ Returns a reference to bit + + + +-bool operator[](size_t n) const ++bool operator[](size_t n) const + + + bitset +@@ -432,7 +432,7 @@ Returns true if bit n + + + +-unsigned long to_ulong() const ++unsigned long to_ulong() const + + + bitset +@@ -445,7 +445,7 @@ Returns an unsigned long corres + + + template<class Char, class Traits, class Alloc> +-basic_string<Char,Traits,Alloc> to_string() const ++basic_string<Char,Traits,Alloc> to_string() const + + + +@@ -457,7 +457,7 @@ Returns a string representation of * + + + +-bool operator==(const bitset&) const ++bool operator==(const bitset&) const + + + Equality Comparable +@@ -468,7 +468,7 @@ The equality operator. + + + +-bool operator!=(const bitset&) const ++bool operator!=(const bitset&) const + + + Equality Comparable +@@ -479,7 +479,7 @@ The inequality operator. + + + +-bitset operator&(const bitset&, const bitset&) ++bitset operator&(const bitset&, const bitset&) + + + bitset +@@ -491,7 +491,7 @@ Bitwise and of two bitsets. This is a g + + + +-bitset operator|(const bitset&, const bitset&) ++bitset operator|(const bitset&, const bitset&) + + + bitset +@@ -503,7 +503,7 @@ Bitwise or of two bitsets. This is a gl + + + +-bitset operator^(const bitset&, const bitset&) ++bitset operator^(const bitset&, const bitset&) + + + bitset +@@ -519,7 +519,7 @@ Bitwise exclusive or of two bitsets. Th + template <class Char, class Traits, + size_t N> + basic_istream<Char,Traits>& +-operator>>(basic_istream<Char,Traits>&, ++operator>>(basic_istream<Char,Traits>&, + bitset<N>&) + + +@@ -536,7 +536,7 @@ Extract a bitset from an input + template <class Char, class Traits, + size_t N> + basic_ostream<Char,Traits>& +-operator>>(basic_ostream<Char,Traits>&, ++operator>>(basic_ostream<Char,Traits>&, + const bitset<N>&) + + +@@ -576,7 +576,7 @@ A proxy class that acts as a reference t + + + +-bitset(unsigned long val) ++bitset(unsigned long val) + + + Conversion from unsigned long. Constructs a bitset, initializing +@@ -589,7 +589,7 @@ Conversion from unsigned long. Construc + + template<class Char, class Traits, class Alloc> + explicit +-bitset(const basic_string<Char,Traits,Alloc>& s, ++bitset(const basic_string<Char,Traits,Alloc>& s, + size_t pos = 0, + size_t n = + basic_string<Char,Traits,Alloc>::npos) +@@ -610,7 +610,7 @@ Conversion from string. Constructs a bi + + + +-bitset& operator&=(const bitset&) ++bitset& operator&=(const bitset&) + + + Bitwise and. +@@ -618,7 +618,7 @@ Bitwise and. + + + +-bitset& operator|=(const bitset&) ++bitset& operator|=(const bitset&) + + + Bitwise inclusive or. +@@ -626,7 +626,7 @@ Bitwise inclusive or. + + + +-bitset& operator^=(const bitset&) ++bitset& operator^=(const bitset&) + + + Bitwise exclusive or. +@@ -634,7 +634,7 @@ Bitwise exclusive or. + + + +-bitset& operator<<=(size_t n) ++bitset& operator<<=(size_t n) + + + Left shift, where bit 0 is considered the least significant bit. +@@ -644,7 +644,7 @@ Left shift, where bit 0 is cons + + + +-bitset& operator>>=(size_t n) ++bitset& operator>>=(size_t n) + + + Right shift, where bit 0 is considered the least significant bit. +@@ -654,7 +654,7 @@ Right shift, where bit 0 is con + + + +-bitset operator<<(size_t n) const ++bitset operator<<(size_t n) const + + + Returns a copy of *this shifted left by n bits. +@@ -665,7 +665,7 @@ Returns a copy of *this shifted + + + +-bitset operator>>(size_t n) const ++bitset operator>>(size_t n) const + + + Returns a copy of *this shifted right by n bits. +@@ -676,7 +676,7 @@ Returns a copy of *this shifted + + + +-bitset& set() ++bitset& set() + + + Sets every bit. +@@ -684,7 +684,7 @@ Sets every bit. + + + +-bitset& flip() ++bitset& flip() + + + Flips the value of every bit. +@@ -692,7 +692,7 @@ Flips the value of every bit. + + + +-bitset operator~() const ++bitset operator~() const + + + Returns a copy of *this with all of its bits flipped. +@@ -700,7 +700,7 @@ Returns a copy of *this with al + + + +-bitset& reset() ++bitset& reset() + + + Clears every bit. +@@ -708,7 +708,7 @@ Clears every bit. + + + +-bitset& set(size_t n, int val = 1) ++bitset& set(size_t n, int val = 1) + + + Sets bit n if val is nonzero, and clears bit n if val is zero. +@@ -717,7 +717,7 @@ Sets bit n if val is n + + + +-bitset& reset(size_t n) ++bitset& reset(size_t n) + + + Clears bit n. +@@ -726,7 +726,7 @@ Clears bit n. + + + +-bitset flip(size_t n) ++bitset flip(size_t n) + + + Flips bit n. +@@ -735,7 +735,7 @@ Flips bit n. + + + +-size_t size() const ++size_t size() const + + + Returns N. +@@ -743,7 +743,7 @@ Returns N. + + + +-size_t count() const ++size_t count() const + + + Returns the number of bits that are set. +@@ -751,7 +751,7 @@ Returns the number of bits that are set. + + + +-bool any() const ++bool any() const + + + Returns true if any bits are set. +@@ -759,7 +759,7 @@ Returns true if any bits are se + + + +-bool none() const ++bool none() const + + + Returns true if no bits are set. +@@ -767,7 +767,7 @@ Returns true if no bits are set + + + +-bool test(size_t n) const ++bool test(size_t n) const + + + Returns true if bit n is set. +@@ -776,7 +776,7 @@ Returns true if bit n + + + +-reference operator[](size_t n) ++reference operator[](size_t n) + + + Returns a reference to bit n. Note that reference is a +@@ -787,7 +787,7 @@ Returns a reference to bit + + + +-bool operator[](size_t n) const ++bool operator[](size_t n) const + + + Returns true if bit n is set. +@@ -795,7 +795,7 @@ Returns true if bit n + + + +-unsigned long to_ulong() const ++unsigned long to_ulong() const + + + Returns an unsigned long corresponding to the bits in *this. +@@ -808,7 +808,7 @@ Returns an unsigned long corres + + + template<class Char, class Traits, class Alloc> +-basic_string<Char,Traits,Alloc> to_string() const ++basic_string<Char,Traits,Alloc> to_string() const + + + +@@ -829,7 +829,7 @@ b.template to_string<char, char_trait + + + +-bitset operator&(const bitset&, const bitset&) ++bitset operator&(const bitset&, const bitset&) + + + Bitwise and of two bitsets. This is a global function, +@@ -840,7 +840,7 @@ Bitwise and of two bitsets. This is a g + + + +-bitset operator|(const bitset&, const bitset&) ++bitset operator|(const bitset&, const bitset&) + + + Bitwise or of two bitsets. This is a global function, +@@ -851,7 +851,7 @@ Bitwise or of two bitsets. This is a gl + + + +-bitset operator^(const bitset&, const bitset&) ++bitset operator^(const bitset&, const bitset&) + + + Bitwise exclusive or of two bitsets. This is a global function, +@@ -866,7 +866,7 @@ Bitwise exclusive or of two bitsets. Th + template <class Char, class Traits, + size_t N> + basic_istream<Char, Traits>& +-operator>>(basic_istream<Char,Traits>& is, ++operator>>(basic_istream<Char,Traits>& is, + bitset<N>& x) + + +@@ -890,7 +890,7 @@ Extract a bitset from an input + template <class Char, class Traits, + size_t N> + basic_ostream<Char,Traits>& +-operator>>(basic_ostream<Char,Traits>& os, ++operator>>(basic_ostream<Char,Traits>& os, + const bitset<N>& x) + + +--- stl-manual-3.30.orig/less_equal.html ++++ stl-manual-3.30/less_equal.html +@@ -144,7 +144,7 @@ The type of the result: bool + + + +-less_equal() ++less_equal() + + + DefaultConstructible +@@ -155,7 +155,7 @@ The default constructor. + + + +-bool operator()(const T& x, const T& y) ++bool operator()(const T& x, const T& y) + + + Binary Function +--- stl-manual-3.30.orig/basic_string.html ++++ stl-manual-3.30/basic_string.html +@@ -306,7 +306,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() ++iterator begin() + + + Container +@@ -317,7 +317,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -328,7 +328,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -339,7 +339,7 @@ Returns a const_iterator pointi + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -350,7 +350,7 @@ Returns a const_iterator pointi + + + +-reverse_iterator rbegin() ++reverse_iterator rbegin() + + + Reversible Container +@@ -362,7 +362,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() ++reverse_iterator rend() + + + Reversible Container +@@ -374,7 +374,7 @@ Returns a reverse_iterator poin + + + +-const_reverse_iterator rbegin() const ++const_reverse_iterator begin() const + + + Reversible Container +@@ -386,7 +386,7 @@ Returns a const_reverse_iterator + + +-const_reverse_iterator rend() const ++const_reverse_iterator rend() const + + + Reversible Container +@@ -398,7 +398,7 @@ Returns a const_reverse_iterator + + +-size_type size() const ++size_type size() const + + + Container +@@ -409,7 +409,7 @@ Returns the size of the string. + + + +-size_type length() const ++size_type length() const + + + basic_string +@@ -420,7 +420,7 @@ Synonym for size(). + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -431,7 +431,7 @@ Returns the largest possible size of the + + + +-size_type capacity() const ++size_type capacity() const + + + basic_string +@@ -442,7 +442,7 @@ See below. + + + +-bool empty() const ++bool empty() const + + + Container +@@ -453,7 +453,7 @@ See below. + + + +-reference operator[](size_type n) ++reference operator[](size_type n) + + + Random Access Container +@@ -464,7 +464,7 @@ Returns the n'th character. + + + +-const_reference operator[](size_type n) const ++const_reference operator[](size_type n) const + + + Random Access Container +@@ -475,7 +475,7 @@ Returns the n'th character. + + + +-const charT* c_str() const ++const charT* c_str() const + + + basic_string +@@ -487,7 +487,7 @@ Returns a pointer to a null-terminated a + + + +-const charT* data() const ++const charT* data() const + + + basic_string +@@ -499,7 +499,7 @@ Returns a pointer to an array of charact + + + +-basic_string() ++basic_string() + + + Container +@@ -511,7 +511,7 @@ Creates an empty string. + + + +-basic_string(const basic_string& s, ++basic_string(const basic_string& s, + size_type pos = 0, size_type n = npos) + + +@@ -524,7 +524,7 @@ Generalization of the copy constructor. + + + +-basic_string(const charT*) ++basic_string(const charT*) + + + basic_string +@@ -535,7 +535,7 @@ Construct a string from a null-terminate + + + +-basic_string(const charT* s, size_type n) ++basic_string(const charT* s, size_type n) + + + basic_string +@@ -546,7 +546,7 @@ Construct a string from a character arra + + + +-basic_string(size_type n, charT c) ++basic_string(size_type n, charT c) + + + Sequence +@@ -559,7 +559,7 @@ Create a string with n copies o + + + template <class InputIterator> +-basic_string(InputIterator first, InputIterator last) ++basic_string(InputIterator first, InputIterator last) + + + +@@ -571,7 +571,7 @@ Create a string from a range. + + + +-~basic_string() ++~basic_string() + + + Container +@@ -582,7 +582,7 @@ The destructor. + + + +-basic_string& operator=(const basic_string&) ++basic_string& operator=(const basic_string&) + + + Container +@@ -593,7 +593,7 @@ The assignment operator + + + +-basic_string& operator=(const charT* s) ++basic_string& operator=(const charT* s) + + + basic_string +@@ -604,7 +604,7 @@ Assign a null-terminated character array + + + +-basic_string& operator=(charT c) ++basic_string& operator=(charT c) + + + basic_string +@@ -615,7 +615,7 @@ Assign a single character to a string. + + + +-void reserve(size_t) ++void reserve(size_t) + + + basic_string +@@ -626,7 +626,7 @@ See below. + + + +-void swap(basic_string&) ++void swap(basic_string&) + + + Container +@@ -638,7 +638,7 @@ Swaps the contents of two strings. + + + +-iterator insert(iterator pos, ++iterator insert(iterator pos, + const T& x) + + +@@ -653,7 +653,7 @@ Inserts x before pos. + + + template <class InputIterator> +-void insert(iterator pos, ++void insert(iterator pos, + InputIterator f, InputIterator l) + [1] + +@@ -668,7 +668,7 @@ Inserts the range [first, last) + + + +-void insert(iterator pos, ++void insert(iterator pos, + size_type n, const T& x) + + +@@ -681,7 +681,7 @@ Inserts n copies of x + + + +-basic_string& insert(size_type pos, const basic_string& s) ++basic_string& insert(size_type pos, const basic_string& s) + + + basic_string +@@ -693,7 +693,7 @@ Inserts s before pos. + + + +-basic_string& insert(size_type pos, ++basic_string& insert(size_type pos, + const basic_string& s, + size_type pos1, size_type n) + +@@ -707,7 +707,7 @@ Inserts a substring of s before + + + +-basic_string& insert(size_type pos, const charT* s) ++basic_string& insert(size_type pos, const charT* s) + + + basic_string +@@ -718,7 +718,7 @@ Inserts s before pos. + + + +-basic_string& insert(size_type pos, const charT* s, size_type n) ++basic_string& insert(size_type pos, const charT* s, size_type n) + + + basic_string +@@ -729,7 +729,7 @@ Inserts the first n characters of s< + + + +-basic_string& insert(size_type pos, size_type n, charT c) ++basic_string& insert(size_type pos, size_type n, charT c) + + + basic_string +@@ -740,7 +740,7 @@ Inserts n copies of c + + + +-basic_string& append(const basic_string& s) ++basic_string& append(const basic_string& s) + + + basic_string +@@ -752,7 +752,7 @@ Append s to *this. + + + +-basic_string& append(const basic_string& s, ++basic_string& append(const basic_string& s, + size_type pos, size_type n) + + +@@ -765,7 +765,7 @@ Append a substring of s to + + + +-basic_string& append(const charT* s) ++basic_string& append(const charT* s) + + + basic_string +@@ -776,7 +776,7 @@ Append s to *this. + + + +-basic_string& append(const charT* s, size_type n) ++basic_string& append(const charT* s, size_type n) + + + basic_string +@@ -787,7 +787,7 @@ Append the first n characters o + + + +-basic_string& append(size_type n, charT c) ++basic_string& append(size_type n, charT c) + + + basic_string +@@ -800,7 +800,7 @@ Append n copies of c t + + + template <class InputIterator> +-basic_string& append(InputIterator first, InputIterator last) ++basic_string& append(InputIterator first, InputIterator last) + + + +@@ -812,7 +812,7 @@ Append a range to *this. + + + +-void push_back(charT c) ++void push_back(charT c) + + + basic_string +@@ -823,7 +823,7 @@ Append a single character to *this + + +-basic_string& operator+=(const basic_string& s) ++basic_string& operator+=(const basic_string& s) + + + basic_string +@@ -834,7 +834,7 @@ Equivalent to append(s). + + + +-basic_string& operator+=(const charT* s) ++basic_string& operator+=(const charT* s) + + + basic_string +@@ -845,7 +845,7 @@ Equivalent to append(s) + + + +-basic_string& operator+=(charT c) ++basic_string& operator+=(charT c) + + + basic_string +@@ -856,7 +856,7 @@ Equivalent to push_back(c) + + + +-iterator erase(iterator p) ++iterator erase(iterator p) + + + Sequence +@@ -867,7 +867,7 @@ Erases the character at position p + + +-iterator erase(iterator first, iterator last) ++iterator erase(iterator first, iterator last) + + + Sequence +@@ -878,7 +878,7 @@ Erases the range [first, last) + + + +-basic_string& erase(size_type pos = 0, size_type n = npos) ++basic_string& erase(size_type pos = 0, size_type n = npos) + + + basic_string +@@ -889,7 +889,7 @@ Erases a range. + + + +-void clear() ++void clear() + + + Sequence +@@ -900,7 +900,7 @@ Erases the entire container. + + + +-void resize(size_type n, charT c = charT()) ++void resize(size_type n, charT c = charT()) + + + Sequence +@@ -912,7 +912,7 @@ Appends characters, or erases characters + + + +-basic_string& assign(const basic_string&) ++basic_string& assign(const basic_string&) + + + basic_string +@@ -924,7 +924,7 @@ Synonym for operator= + + + +-basic_string& assign(const basic_string& s, ++basic_string& assign(const basic_string& s, + size_type pos, size_type n) + + +@@ -937,7 +937,7 @@ Assigns a substring of s to + + +-basic_string& assign(const charT* s, size_type n) ++basic_string& assign(const charT* s, size_type n) + + + basic_string +@@ -948,7 +948,7 @@ Assigns the first n characters + + + +-basic_string& assign(const charT* s) ++basic_string& assign(const charT* s) + + + basic_string +@@ -959,7 +959,7 @@ Assigns a null-terminated array of chara + + + +-basic_string& assign(size_type n, charT c) ++basic_string& assign(size_type n, charT c) + + + Sequence +@@ -972,7 +972,7 @@ Erases the existing characters and repla + + + template <class InputIterator> +-basic_string& assign(InputIterator first, InputIterator last) ++basic_string& assign(InputIterator first, InputIterator last) + + + +@@ -985,7 +985,7 @@ Erases the existing characters and repla + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + const basic_string& s) + + +@@ -999,7 +999,7 @@ Replaces a substring of *this w + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + const basic_string& s, + size_type pos1, size_type n1) + +@@ -1014,7 +1014,7 @@ Replaces a substring of *this w + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + const charT* s, size_type n1) + + +@@ -1028,7 +1028,7 @@ Replaces a substring of *this w + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + const charT* s) + + +@@ -1042,7 +1042,7 @@ Replaces a substring of *this w + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + size_type n1, charT c) + + +@@ -1056,7 +1056,7 @@ Replaces a substring of *this w + + + +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + const basic_string& s) + + +@@ -1070,7 +1070,7 @@ Replaces a substring of *this w + + + +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + const charT* s, size_type n) + + +@@ -1084,7 +1084,7 @@ Replaces a substring of *this w + + + +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + const charT* s) + + +@@ -1098,7 +1098,7 @@ Replaces a substring of *this w + + + +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + size_type n, charT c) + + +@@ -1113,7 +1113,7 @@ Replaces a substring of *this w + + + template <class InputIterator> +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + InputIterator f, InputIterator l) + + +@@ -1126,7 +1126,7 @@ Replaces a substring of *this w + + + +-size_type copy(charT* buf, size_type n, size_type pos = 0) const ++size_type copy(charT* buf, size_type n, size_type pos = 0) const + + + basic_string +@@ -1137,7 +1137,7 @@ Copies a substring of *this to + + + +-size_type find(const basic_string& s, size_type pos = 0) const ++size_type find(const basic_string& s, size_type pos = 0) const + + + basic_string +@@ -1149,7 +1149,7 @@ Searches for s as a substring o + + + +-size_type find(const charT* s, size_type pos, size_type n) const ++size_type find(const charT* s, size_type pos, size_type n) const + + + basic_string +@@ -1161,7 +1161,7 @@ Searches for the first n charac + + + +-size_type find(const charT* s, size_type pos = 0) const ++size_type find(const charT* s, size_type pos = 0) const + + + basic_string +@@ -1173,7 +1173,7 @@ Searches for a null-terminated character + + + +-size_type find(charT c, size_type pos = 0) const ++size_type find(charT c, size_type pos = 0) const + + + basic_string +@@ -1184,7 +1184,7 @@ Searches for the character c, b + + + +-size_type rfind(const basic_string& s, size_type pos = npos) const ++size_type rfind(const basic_string& s, size_type pos = npos) const + + + basic_string +@@ -1196,7 +1196,7 @@ Searches backward for s as a su + + + +-size_type rfind(const charT* s, size_type pos, size_type n) const ++size_type rfind(const charT* s, size_type pos, size_type n) const + + + basic_string +@@ -1208,7 +1208,7 @@ Searches backward for the first n + + +-size_type rfind(const charT* s, size_type pos = npos) const ++size_type rfind(const charT* s, size_type pos = npos) const + + + basic_string +@@ -1220,7 +1220,7 @@ Searches backward for a null-terminated + + + +-size_type rfind(charT c, size_type pos = npos) const ++size_type rfind(charT c, size_type pos = npos) const + + + basic_string +@@ -1231,7 +1231,7 @@ Searches backward for the character + + + +-size_type find_first_of(const basic_string& s, size_type pos = 0) const ++size_type find_first_of(const basic_string& s, size_type pos = 0) const + + + basic_string +@@ -1243,7 +1243,7 @@ Searches within *this, beginnin + + + +-size_type find_first_of(const charT* s, size_type pos, size_type n) const ++size_type find_first_of(const charT* s, size_type pos, size_type n) const + + + basic_string +@@ -1255,7 +1255,7 @@ Searches within *this, beginnin + + + +-size_type find_first_of(const charT* s, size_type pos = 0) const ++size_type find_first_of(const charT* s, size_type pos = 0) const + + + basic_string +@@ -1267,7 +1267,7 @@ Searches within *this, beginnin + + + +-size_type find_first_of(charT c, size_type pos = 0) const ++size_type find_first_of(charT c, size_type pos = 0) const + + + basic_string +@@ -1279,7 +1279,7 @@ Searches within *this, beginnin + + + +-size_type find_first_not_of(const basic_string& s, size_type pos = 0) const ++size_type find_first_not_of(const basic_string& s, size_type pos = 0) const + + + basic_string +@@ -1291,7 +1291,7 @@ Searches within *this, beginnin + + + +-size_type find_first_not_of(const charT* s, size_type pos, size_type n) const ++size_type find_first_not_of(const charT* s, size_type pos, size_type n) const + + + basic_string +@@ -1303,7 +1303,7 @@ Searches within *this, beginnin + + + +-size_type find_first_not_of(const charT* s, size_type pos = 0) const ++size_type find_first_not_of(const charT* s, size_type pos = 0) const + + + basic_string +@@ -1315,7 +1315,7 @@ Searches within *this, beginnin + + + +-size_type find_first_not_of(charT c, size_type pos = 0) const ++size_type find_first_not_of(charT c, size_type pos = 0) const + + + basic_string +@@ -1327,7 +1327,7 @@ Searches within *this, beginnin + + + +-size_type find_last_of(const basic_string& s, size_type pos = npos) const ++size_type find_last_of(const basic_string& s, size_type pos = npos) const + + + basic_string +@@ -1339,7 +1339,7 @@ Searches backward within *this, + + + +-size_type find_last_of(const charT* s, size_type pos, size_type n) const ++size_type find_last_of(const charT* s, size_type pos, size_type n) const + + + basic_string +@@ -1351,7 +1351,7 @@ Searches backward within *this, + + + +-size_type find_last_of(const charT* s, size_type pos = npos) const ++size_type find_last_of(const charT* s, size_type pos = npos) const + + + basic_string +@@ -1363,7 +1363,7 @@ Searches backward *this, beginn + + + +-size_type find_last_of(charT c, size_type pos = npos) const ++size_type find_last_of(charT c, size_type pos = npos) const + + + basic_string +@@ -1375,7 +1375,7 @@ Searches backward *this, beginn + + + +-size_type find_last_not_of(const basic_string& s, size_type pos = npos) const ++size_type find_last_not_of(const basic_string& s, size_type pos = npos) const + + + basic_string +@@ -1387,7 +1387,7 @@ Searches backward within *this, + + + +-size_type find_last_not_of(const charT* s, size_type pos, size_type n) const ++size_type find_last_not_of(const charT* s, size_type pos, size_type n) const + + + basic_string +@@ -1399,7 +1399,7 @@ Searches backward within *this, + + + +-size_type find_last_not_of(const charT* s, size_type pos = npos) const ++size_type find_last_not_of(const charT* s, size_type pos = npos) const + + + basic_string +@@ -1411,7 +1411,7 @@ Searches backward *this, beginn + + + +-size_type find_last_not_of(charT c, size_type pos = npos) const ++size_type find_last_not_of(charT c, size_type pos = npos) const + + + basic_string +@@ -1423,7 +1423,7 @@ Searches backward *this, beginn + + + +-basic_string substr(size_type pos = 0, size_type n = npos) const ++basic_string substr(size_type pos = 0, size_type n = npos) const + + + basic_string +@@ -1434,7 +1434,7 @@ Returns a substring of *this. + + + +-int compare(const basic_string& s) const ++int compare(const basic_string& s) const + + + basic_string +@@ -1445,7 +1445,7 @@ Three-way lexicographical comparison of + + + +-int compare(size_type pos, size_type n, const basic_string& s) const ++int compare(size_type pos, size_type n, const basic_string& s) const + + + basic_string +@@ -1456,7 +1456,7 @@ Three-way lexicographical comparison of + + + +-int compare(size_type pos, size_type n, const basic_string& s, size_type pos1, size_type n1) const ++int compare(size_type pos, size_type n, const basic_string& s, size_type pos1, size_type n1) const + + + basic_string +@@ -1467,7 +1467,7 @@ Three-way lexicographical comparison of + + + +-int compare(const charT* s) const ++int compare(const charT* s) const + + + basic_string +@@ -1478,7 +1478,7 @@ Three-way lexicographical comparison of + + + +-int compare(size_type pos, size_type n, const charT* s, size_type len = npos) const ++int compare(size_type pos, size_type n, const charT* s, size_type len = npos) const + + + basic_string +@@ -1493,7 +1493,7 @@ Three-way lexicographical comparison of + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(const basic_string<charT, traits, Alloc>& s1, ++operator+(const basic_string<charT, traits, Alloc>& s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1509,7 +1509,7 @@ String concatenation. A global function + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(const charT* s1, ++operator+(const charT* s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1525,7 +1525,7 @@ String concatenation. A global function + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(const basic_string<charT, traits, Alloc>& s1, ++operator+(const basic_string<charT, traits, Alloc>& s1, + const charT* s2) + + +@@ -1541,7 +1541,7 @@ String concatenation. A global function + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(charT c, ++operator+(charT c, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1557,7 +1557,7 @@ String concatenation. A global function + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(const basic_string<charT, traits, Alloc>& s1, ++operator+(const basic_string<charT, traits, Alloc>& s1, + charT c) + + +@@ -1572,7 +1572,7 @@ String concatenation. A global function + + + template <class charT, class traits, class Alloc> +-bool operator==(const basic_string<charT, traits, Alloc>& s1, ++bool operator==(const basic_string<charT, traits, Alloc>& s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1587,7 +1587,7 @@ String equality. A global function, not + + + template <class charT, class traits, class Alloc> +-bool operator==(const charT* s1, ++bool operator==(const charT* s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1602,7 +1602,7 @@ String equality. A global function, not + + + template <class charT, class traits, class Alloc> +-bool operator==(const basic_string<charT, traits, Alloc>& s1, ++bool operator==(const basic_string<charT, traits, Alloc>& s1, + const charT* s2) + + +@@ -1617,7 +1617,7 @@ String equality. A global function, not + + + template <class charT, class traits, class Alloc> +-bool operator!=(const basic_string<charT, traits, Alloc>& s1, ++bool operator!=(const basic_string<charT, traits, Alloc>& s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1632,7 +1632,7 @@ String inequality. A global function, n + + + template <class charT, class traits, class Alloc> +-bool operator!=(const charT* s1, ++bool operator!=(const charT* s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1647,7 +1647,7 @@ String inequality. A global function, n + + + template <class charT, class traits, class Alloc> +-bool operator!=(const basic_string<charT, traits, Alloc>& s1, ++bool operator!=(const basic_string<charT, traits, Alloc>& s1, + const charT* s2) + + +@@ -1662,7 +1662,7 @@ String inequality. A global function, n + + + template <class charT, class traits, class Alloc> +-bool operator<(const basic_string<charT, traits, Alloc>& s1, ++bool operator<(const basic_string<charT, traits, Alloc>& s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1677,7 +1677,7 @@ String comparison. A global function, n + + + template <class charT, class traits, class Alloc> +-bool operator<(const charT* s1, ++bool operator<(const charT* s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -1692,7 +1692,7 @@ String comparison. A global function, n + + + template <class charT, class traits, class Alloc> +-bool operator<(const basic_string<charT, traits, Alloc>& s1, ++bool operator<(const basic_string<charT, traits, Alloc>& s1, + const charT* s2) + + +@@ -1707,7 +1707,7 @@ String comparison. A global function, n + + + template <class charT, class traits, class Alloc> +-void swap(basic_string<charT, traits, Alloc>& s1, ++void swap(basic_string<charT, traits, Alloc>& s1, + basic_string<charT, traits, Alloc>& s2) + + +@@ -1723,7 +1723,7 @@ Swaps the contents of two strings. + + template <class charT, class traits, class Alloc> + basic_istream<charT, traits>& +-operator>>(basic_istream<charT, traits>& is, ++operator>>(basic_istream<charT, traits>& is, + basic_string<charT, traits, Alloc>& s) + + +@@ -1739,7 +1739,7 @@ Reads s from the input stream < + + template <class charT, class traits, class Alloc> + basic_ostream<charT, traits>& +-operator<<(basic_istream<charT, traits>& os, ++operator<<(basic_istream<charT, traits>& os, + const basic_string<charT, traits, Alloc>& s) + + +@@ -1755,7 +1755,7 @@ Writes s to the output stream < + + template <class charT, class traits, class Alloc> + basic_istream<charT, traits>& +-getline(basic_istream<charT, traits>& is, ++getline(basic_istream<charT, traits>& is, + basic_string<charT, traits, Alloc>& s, + charT delim) + +@@ -1772,7 +1772,7 @@ Reads a string from the input stream + template <class charT, class traits, class Alloc> + basic_istream<charT, traits>& +-getline(basic_istream<charT, traits>& is, ++getline(basic_istream<charT, traits>& is, + basic_string<charT, traits, Alloc>& s) + + +@@ -1808,7 +1808,7 @@ The largest possible value of type s + + + +-size_type length() const ++size_type length() const + + + Equivalent to size(). +@@ -1816,7 +1816,7 @@ Equivalent to size(). + + + +-size_type capacity() const ++size_type capacity() const + + + Number of elements for which memory has been allocated. That is, +@@ -1827,7 +1827,7 @@ Number of elements for which memory has + + + +-const charT* c_str() const ++const charT* c_str() const + + + Returns a pointer to a null-terminated array of characters representing +@@ -1840,7 +1840,7 @@ Returns a pointer to a null-terminated a + + + +-const charT* data() const ++const charT* data() const + + + Returns a pointer to an array of characters, not necessarily +@@ -1853,7 +1853,7 @@ Returns a pointer to an array of charact + + + +-basic_string(const basic_string& s, size_type pos = 0, size_type n = npos) ++basic_string(const basic_string& s, size_type pos = 0, size_type n = npos) + + + Constructs a string from a substring of s. The substring begins at +@@ -1865,7 +1865,7 @@ Constructs a string from a substring of + + + +-basic_string(const charT* s) ++basic_string(const charT* s) + + + Equivalent to basic_string(s, s + traits::length(s)). +@@ -1873,7 +1873,7 @@ Equivalent to basic_string(s, s + tr + + + +-basic_string(const charT* s, size_type n) ++basic_string(const charT* s, size_type n) + + + Equivalent to basic_string(s, s + n). +@@ -1881,7 +1881,7 @@ Equivalent to basic_string(s, s + n) + + + +-basic_string& operator=(const charT* s) ++basic_string& operator=(const charT* s) + + + Equivalent to operator=(basic_string(s)). +@@ -1889,7 +1889,7 @@ Equivalent to operator=(basic_string + + + +-basic_string& operator=(charT c) ++basic_string& operator=(charT c) + + + Assigns to *this a string whose size is 1 and whose contents is +@@ -1898,7 +1898,7 @@ Assigns to *this a string whose + + + +-void reserve(size_t n) ++void reserve(size_t n) + + + Requests that the string's capacity be changed; the postcondition +@@ -1913,7 +1913,7 @@ Requests that the string's capacity be c + + + +-basic_string& insert(size_type pos, const basic_string& s) ++basic_string& insert(size_type pos, const basic_string& s) + + + If pos > size(), throws out_of_range. Otherwise, equivalent to +@@ -1923,7 +1923,7 @@ If pos > size(), throws + + + +-basic_string& insert(size_type pos, ++basic_string& insert(size_type pos, + const basic_string& s, + size_type pos1, size_type n) + +@@ -1935,7 +1935,7 @@ If pos > size() or pos1 + + + +-basic_string& insert(size_type pos, const charT* s) ++basic_string& insert(size_type pos, const charT* s) + + + If pos > size(), throws out_of_range. Otherwise, equivalent to +@@ -1944,7 +1944,7 @@ If pos > size(), throws + + + +-basic_string& insert(size_type pos, const charT* s, size_type n) ++basic_string& insert(size_type pos, const charT* s, size_type n) + + + If pos > size(), throws out_of_range. Otherwise, equivalent to +@@ -1953,7 +1953,7 @@ If pos > size(), throws + + + +-basic_string& insert(size_type pos, size_type n, charT c) ++basic_string& insert(size_type pos, size_type n, charT c) + + + If pos > size(), throws out_of_range. Otherwise, equivalent to +@@ -1962,7 +1962,7 @@ If pos > size(), throws + + + +-basic_string& append(const basic_string& s) ++basic_string& append(const basic_string& s) + + + Equivalent to insert(end(), s.begin(), s.end()). +@@ -1971,7 +1971,7 @@ Equivalent to insert(end(), s.begin( + + + +-basic_string& append(const basic_string& s, ++basic_string& append(const basic_string& s, + size_type pos, size_type n) + + +@@ -1982,7 +1982,7 @@ If pos > s.size(), throws + + +-basic_string& append(const charT* s) ++basic_string& append(const charT* s) + + + Equivalent to insert(end(), s, s + traits::length(s)). +@@ -1990,7 +1990,7 @@ Equivalent to insert(end(), s, s + t + + + +-basic_string& append(const charT* s, size_type n) ++basic_string& append(const charT* s, size_type n) + + + Equivalent to insert(end(), s, s + n). +@@ -1998,7 +1998,7 @@ Equivalent to insert(end(), s, s + n + + + +-basic_string& append(size_type n, charT c) ++basic_string& append(size_type n, charT c) + + + Equivalent to insert(end(), n, c). +@@ -2008,7 +2008,7 @@ Equivalent to insert(end(), n, c) + + template <class InputIterator> +-basic_string& append(InputIterator first, InputIterator last) ++basic_string& append(InputIterator first, InputIterator last) + + + +@@ -2017,7 +2017,7 @@ Equivalent to insert(end(), first, l + + + +-void push_back(charT c) ++void push_back(charT c) + + + Equivalent to insert(end(), c) +@@ -2025,7 +2025,7 @@ Equivalent to insert(end(), c) + + + +-basic_string& operator+=(const basic_string& s) ++basic_string& operator+=(const basic_string& s) + + + Equivalent to append(s). +@@ -2033,7 +2033,7 @@ Equivalent to append(s). + + + +-basic_string& operator+=(const charT* s) ++basic_string& operator+=(const charT* s) + + + Equivalent to append(s) +@@ -2041,7 +2041,7 @@ Equivalent to append(s) + + + +-basic_string& operator+=(charT c) ++basic_string& operator+=(charT c) + + + Equivalent to push_back(c) +@@ -2049,7 +2049,7 @@ Equivalent to push_back(c) + + + +-basic_string& erase(size_type pos = 0, size_type n = npos) ++basic_string& erase(size_type pos = 0, size_type n = npos) + + + If pos > size(), throws out_of_range. Otherwise, equivalent to +@@ -2058,7 +2058,7 @@ If pos > size(), throws + + + +-basic_string& assign(const basic_string& s) ++basic_string& assign(const basic_string& s) + + + Synonym for operator= +@@ -2067,7 +2067,7 @@ Synonym for operator= + + + +-basic_string& assign(const basic_string& s, ++basic_string& assign(const basic_string& s, + size_type pos, size_type n) + + +@@ -2077,7 +2077,7 @@ Equivalent to (but probably faster than) + + + +-basic_string& assign(const charT* s, size_type n) ++basic_string& assign(const charT* s, size_type n) + + + Equivalent to (but probably faster than) clear() followed by insert(0, s, n). +@@ -2085,7 +2085,7 @@ Equivalent to (but probably faster than) + + + +-basic_string& assign(const charT* s) ++basic_string& assign(const charT* s) + + + Equivalent to (but probably faster than) clear() followed by insert(0, s). +@@ -2094,7 +2094,7 @@ Equivalent to (but probably faster than) + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + const basic_string& s) + + +@@ -2105,7 +2105,7 @@ Equivalent to erase(pos, n) fol + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + const basic_string& s, size_type pos1, size_type n1) + + +@@ -2116,7 +2116,7 @@ Equivalent to erase(pos, n) fol + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + const charT* s, size_type n1) + + +@@ -2127,7 +2127,7 @@ Equivalent to erase(pos, n) fol + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + const charT* s) + + +@@ -2138,7 +2138,7 @@ Equivalent to erase(pos, n) fol + + + +-basic_string& replace(size_type pos, size_type n, ++basic_string& replace(size_type pos, size_type n, + size_type n1, charT c) + + +@@ -2149,7 +2149,7 @@ Equivalent to erase(pos, n) fol + + + +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + const basic_string& s) + + +@@ -2160,7 +2160,7 @@ Equivalent to insert(erase(first, la + + + +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + const charT* s, size_type n) + + +@@ -2171,7 +2171,7 @@ Equivalent to insert(erase(first, la + + + +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + const charT* s) + + +@@ -2182,7 +2182,7 @@ Equivalent to insert(erase(first, la + + + +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + size_type n, charT c) + + +@@ -2194,7 +2194,7 @@ Equivalent to insert(erase(first, la + + + template <class InputIterator> +-basic_string& replace(iterator first, iterator last, ++basic_string& replace(iterator first, iterator last, + InputIterator f, InputIterator l) + + +@@ -2204,7 +2204,7 @@ Equivalent to insert(erase(first, la + + + +-size_type copy(charT* buf, size_type n, size_type pos = 0) const ++size_type copy(charT* buf, size_type n, size_type pos = 0) const + + + Copies at most n characters from *this to a character array. +@@ -2217,7 +2217,7 @@ Copies at most n characters fro + + + +-size_type find(const basic_string& s, size_type pos = 0) const ++size_type find(const basic_string& s, size_type pos = 0) const + + + Searches for s as a substring of *this, beginning at +@@ -2234,7 +2234,7 @@ Searches for s as a substring o + + + +-size_type find(const charT* s, size_type pos, size_type n) const ++size_type find(const charT* s, size_type pos, size_type n) const + + + Searches for the first n characters of s as a substring of *this, beginning at +@@ -2244,7 +2244,7 @@ Searches for the first n charac + + + +-size_type find(const charT* s, size_type pos = 0) const ++size_type find(const charT* s, size_type pos = 0) const + + + Searches for a null-terminated character array as a substring of *this, beginning at +@@ -2254,7 +2254,7 @@ Searches for a null-terminated character + + + +-size_type find(charT c, size_type pos = 0) const ++size_type find(charT c, size_type pos = 0) const + + + Searches for the character c, beginning at character position pos. +@@ -2265,7 +2265,7 @@ Searches for the character c, b + + + +-size_type rfind(const basic_string& s, size_type pos = npos) const ++size_type rfind(const basic_string& s, size_type pos = npos) const + + + Searches backward for s as a substring of *this. +@@ -2283,7 +2283,7 @@ Searches backward for s as a su + + + +-size_type rfind(const charT* s, size_type pos, size_type n) const ++size_type rfind(const charT* s, size_type pos, size_type n) const + + + Searches backward for the first n characters of s as a substring of *this. +@@ -2292,7 +2292,7 @@ Searches backward for the first n + + +-size_type rfind(const charT* s, size_type pos = npos) const ++size_type rfind(const charT* s, size_type pos = npos) const + + + Searches backward for a null-terminated character array as a substring of *this. +@@ -2301,7 +2301,7 @@ Searches backward for a null-terminated + + + +-size_type rfind(charT c, size_type pos = npos) const ++size_type rfind(charT c, size_type pos = npos) const + + + Searches backward for the character c. That is, returns the largest +@@ -2312,7 +2312,7 @@ Searches backward for the character + + + +-size_type find_first_of(const basic_string& s, size_type pos = 0) const ++size_type find_first_of(const basic_string& s, size_type pos = 0) const + + + Searches within *this, beginning at pos, for the first character +@@ -2328,7 +2328,7 @@ Searches within *this, beginnin + + + +-size_type find_first_of(const charT* s, size_type pos, size_type n) const ++size_type find_first_of(const charT* s, size_type pos, size_type n) const + + + Searches within *this, beginning at pos, for the first character +@@ -2341,7 +2341,7 @@ Searches within *this, beginnin + + + +-size_type find_first_of(const charT* s, size_type pos = 0) const ++size_type find_first_of(const charT* s, size_type pos = 0) const + + + Equivalent to find_first_of(s, pos, traits::length(s)). +@@ -2349,7 +2349,7 @@ Equivalent to find_first_of(s, pos, + + + +-size_type find_first_of(charT c, size_type pos = 0) const ++size_type find_first_of(charT c, size_type pos = 0) const + + + Equivalent to find(c, pos). +@@ -2357,7 +2357,7 @@ Equivalent to find(c, pos). + + + +-size_type find_first_not_of(const basic_string& s, size_type pos = 0) const ++size_type find_first_not_of(const basic_string& s, size_type pos = 0) const + + + Searches within *this, beginning at pos, for the first character +@@ -2370,7 +2370,7 @@ Searches within *this, beginnin + + + +-size_type find_first_not_of(const charT* s, size_type pos, size_type n) const ++size_type find_first_not_of(const charT* s, size_type pos, size_type n) const + + + Searches within *this, beginning at pos, for the first character +@@ -2383,7 +2383,7 @@ Searches within *this, beginnin + + + +-size_type find_first_not_of(const charT* s, size_type pos = 0) const ++size_type find_first_not_of(const charT* s, size_type pos = 0) const + + + Equivalent to find_first_not_of(s, pos, traits::length(s)). +@@ -2391,7 +2391,7 @@ Equivalent to find_first_not_of(s, p + + + +-size_type find_first_not_of(charT c, size_type pos = 0) const ++size_type find_first_not_of(charT c, size_type pos = 0) const + + + Returns the smallest character position N +@@ -2402,7 +2402,7 @@ Returns the smallest character position + + + +-size_type find_last_of(const basic_string& s, size_type pos = npos) const ++size_type find_last_of(const basic_string& s, size_type pos = npos) const + + + Searches backward within *this for the first character +@@ -2414,7 +2414,7 @@ Searches backward within *this + + + +-size_type find_last_of(const charT* s, size_type pos, size_type n) const ++size_type find_last_of(const charT* s, size_type pos, size_type n) const + + + Searches backward within *this for the first character +@@ -2427,7 +2427,7 @@ Searches backward within *this + + + +-size_type find_last_of(const charT* s, size_type pos = npos) const ++size_type find_last_of(const charT* s, size_type pos = npos) const + + + Equivalent to find_last_of(s, pos, traits::length(s)). +@@ -2435,7 +2435,7 @@ Equivalent to find_last_of(s, pos, t + + + +-size_type find_last_of(charT c, size_type pos = npos) const ++size_type find_last_of(charT c, size_type pos = npos) const + + + Equivalent to rfind(c, pos). +@@ -2443,7 +2443,7 @@ Equivalent to rfind(c, pos). + + + +-size_type find_last_not_of(const basic_string& s, size_type pos = npos) const ++size_type find_last_not_of(const basic_string& s, size_type pos = npos) const + + + Searches backward within *this for the first character +@@ -2456,7 +2456,7 @@ Searches backward within *this + + + +-size_type find_last_not_of(const charT* s, size_type pos, size_type n) const ++size_type find_last_not_of(const charT* s, size_type pos, size_type n) const + + + Searches backward within *this for the first character +@@ -2469,7 +2469,7 @@ Searches backward within *this + + + +-size_type find_last_not_of(const charT* s, size_type pos = npos) const ++size_type find_last_not_of(const charT* s, size_type pos = npos) const + + + Equivalent to find_last_of(s, pos, traits::length(s)). +@@ -2477,7 +2477,7 @@ Equivalent to find_last_of(s, pos, t + + + +-size_type find_last_not_of(charT c, size_type pos = npos) const ++size_type find_last_not_of(charT c, size_type pos = npos) const + + + Searches backward *this for the first character +@@ -2488,7 +2488,7 @@ Searches backward *this for the + + + +-basic_string substr(size_type pos = 0, size_type n = npos) const ++basic_string substr(size_type pos = 0, size_type n = npos) const + + + Equivalent to basic_string(*this, pos, n). +@@ -2496,7 +2496,7 @@ Equivalent to basic_string(*this, po + + + +-int compare(const basic_string& s) const ++int compare(const basic_string& s) const + + + Three-way lexicographical comparison of s and *this, much like +@@ -2508,7 +2508,7 @@ Three-way lexicographical comparison of + + + +-int compare(size_type pos, size_type n, const basic_string& s) const ++int compare(size_type pos, size_type n, const basic_string& s) const + + + Three-way lexicographical comparison of s and a substring of *this. +@@ -2517,7 +2517,7 @@ Three-way lexicographical comparison of + + + +-int compare(size_type pos, size_type n, const basic_string& s, size_type pos1, size_type n1) const ++int compare(size_type pos, size_type n, const basic_string& s, size_type pos1, size_type n1) const + + + Three-way lexicographical comparison of a substring of s and a substring of *this. +@@ -2526,7 +2526,7 @@ Three-way lexicographical comparison of + + + +-int compare(const charT* s) const ++int compare(const charT* s) const + + + Three-way lexicographical comparison of s and *this. +@@ -2535,7 +2535,7 @@ Three-way lexicographical comparison of + + + +-int compare(size_type pos, size_type n, const charT* s, size_type len = npos) const ++int compare(size_type pos, size_type n, const charT* s, size_type len = npos) const + + + Three-way lexicographical comparison of the first min(len, traits::length(s) +@@ -2548,7 +2548,7 @@ Three-way lexicographical comparison of + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(const basic_string<charT, traits, Alloc>& s1, ++operator+(const basic_string<charT, traits, Alloc>& s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -2562,7 +2562,7 @@ String concatenation. Equivalent to cre + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(const charT* s1, ++operator+(const charT* s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -2577,7 +2577,7 @@ String concatenation. + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(const basic_string<charT, traits, Alloc>& s1, ++operator+(const basic_string<charT, traits, Alloc>& s1, + const charT* s2) + + +@@ -2591,7 +2591,7 @@ String concatenation. Equivalent to cre + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(charT c, ++operator+(charT c, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -2606,7 +2606,7 @@ String concatenation. Equivalent to cre + + template <class charT, class traits, class Alloc> + basic_string<charT, traits, Alloc> +-operator+(const basic_string<charT, traits, Alloc>& s1, ++operator+(const basic_string<charT, traits, Alloc>& s1, + charT c) + + +@@ -2620,7 +2620,7 @@ String concatenation. Equivalent to cre + + + template <class charT, class traits, class Alloc> +-bool operator==(const charT* s1, ++bool operator==(const charT* s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -2633,7 +2633,7 @@ String equality. Equivalent to + + + template <class charT, class traits, class Alloc> +-bool operator==(const basic_string<charT, traits, Alloc>& s1, ++bool operator==(const basic_string<charT, traits, Alloc>& s1, + const charT* s2) + + +@@ -2645,7 +2645,7 @@ String equality. Equivalent to basi + + + template <class charT, class traits, class Alloc> +-bool operator!=(const charT* s1, ++bool operator!=(const charT* s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -2657,7 +2657,7 @@ String inequality. Equivalent to ba + + + template <class charT, class traits, class Alloc> +-bool operator!=(const basic_string<charT, traits, Alloc>& s1, ++bool operator!=(const basic_string<charT, traits, Alloc>& s1, + const charT* s2) + + +@@ -2669,7 +2669,7 @@ String inequality. Equivalent to !( + + + template <class charT, class traits, class Alloc> +-bool operator<(const charT* s1, ++bool operator<(const charT* s1, + const basic_string<charT, traits, Alloc>& s2) + + +@@ -2681,7 +2681,7 @@ String comparison. Equivalent to !( + + + template <class charT, class traits, class Alloc> +-bool operator<(const basic_string<charT, traits, Alloc>& s1, ++bool operator<(const basic_string<charT, traits, Alloc>& s1, + const charT* s2) + + +@@ -2694,7 +2694,7 @@ String comparison. Equivalent to !( + + template <class charT, class traits, class Alloc> + basic_istream<charT, traits>& +-operator>>(basic_istream<charT, traits>& is, ++operator>>(basic_istream<charT, traits>& is, + basic_string<charT, traits, Alloc>& s) + + +@@ -2713,7 +2713,7 @@ Reads s from the input stream < + + template <class charT, class traits, class Alloc> + basic_ostream<charT, traits>& +-operator>>(basic_istream<charT, traits>& is, ++operator>>(basic_istream<charT, traits>& is, + const basic_string<charT, traits, Alloc>& s) + + +@@ -2728,7 +2728,7 @@ Writes s to the output stream < + + template <class charT, class traits, class Alloc> + basic_istream<charT, traits>& +-getline(basic_istream<charT, traits>& is, ++getline(basic_istream<charT, traits>& is, + basic_string<charT, traits, Alloc>& s, + charT delim) + +@@ -2748,7 +2748,7 @@ Replaces the contents of s with + + template <class charT, class traits, class Alloc> + basic_istream<charT, traits>& +-getline(basic_istream<charT, traits>& is, ++getline(basic_istream<charT, traits>& is, + basic_string<charT, traits, Alloc>& s) + + +--- stl-manual-3.30.orig/raw_storage_iterator.html ++++ stl-manual-3.30/raw_storage_iterator.html +@@ -151,7 +151,7 @@ Description + + + +-raw_storage_iterator(ForwardIterator x) ++raw_storage_iterator(ForwardIterator x) + + + raw_storage_iterator +@@ -162,7 +162,7 @@ See below. + + + +-raw_storage_iterator(const raw_storage_iterator&) ++raw_storage_iterator(const raw_storage_iterator&) + + + trivial iterator +@@ -173,7 +173,7 @@ The copy constructor + + + +-raw_storage_iterator& operator=(const raw_storage_iterator&) ++raw_storage_iterator& operator=(const raw_storage_iterator&) + + + trivial iterator +@@ -184,7 +184,7 @@ The assignment operator + + + +-raw_storage_iterator& operator*() ++raw_storage_iterator& operator*() + + + Output Iterator +@@ -195,7 +195,7 @@ Used to implement the Output Iterator +@@ -206,7 +206,7 @@ Used to implement the Output Iterator +@@ -217,7 +217,7 @@ Preincrement. + + + +-raw_storage_iterator& operator++(int) ++raw_storage_iterator& operator++(int) + + + Output Iterator +@@ -228,7 +228,7 @@ Postincrement. + + + +-output_iterator_tag iterator_category(const raw_storage_iterator&) ++output_iterator_tag iterator_category(const raw_storage_iterator&) + + + iterator tags +@@ -254,7 +254,7 @@ Description + + + +-raw_storage_iterator(ForwardIterator i) ++raw_storage_iterator(ForwardIterator i) + + + Creates a raw_storage_iterator whose underlying iterator is i. +@@ -262,7 +262,7 @@ Creates a raw_storage_iterator + + + +-raw_storage_iterator& operator=(const T& val) ++raw_storage_iterator& operator=(const T& val) + + + Constructs an object of ForwardIterator's value type at the +--- stl-manual-3.30.orig/hash_multiset.html ++++ stl-manual-3.30/hash_multiset.html +@@ -315,13 +315,13 @@ Iterator used to iterate through a h + Container + + +-Const iterator used to iterate through a hash_multiset. (Iterator and ++Const iterator used to iterate through a hash_multiset. (Iterator and + const_iterator are the same type.) + + + + +-iterator begin() const ++iterator begin() const + + + Container +@@ -332,7 +332,7 @@ Returns an iterator pointing to + + + +-iterator end() const ++iterator end() const + + + Container +@@ -343,7 +343,7 @@ Returns an iterator pointing to + + + +-size_type size() const ++size_type size() const + + + Container +@@ -354,7 +354,7 @@ Returns the size of the hash_multise + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -365,7 +365,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -376,7 +376,7 @@ Returns the largest possible size of the + + + +-size_type bucket_count() const ++size_type bucket_count() const + + + Hashed Associative Container +@@ -387,7 +387,7 @@ Returns the number of buckets used by th + + + +-void resize(size_type n) ++void resize(size_type n) + + + Hashed Associative Container +@@ -398,7 +398,7 @@ Increases the bucket count to at least < + + + +-hasher hash_funct() const ++hasher hash_funct() const + + + Hashed Associative Container +@@ -409,7 +409,7 @@ Returns the hasher object used + + + +-key_equal key_eq() const ++key_equal key_eq() const + + + Hashed Associative Container +@@ -420,7 +420,7 @@ Returns the key_equal object us + + + +-hash_multiset() ++hash_multiset() + + + Container +@@ -431,7 +431,7 @@ Creates an empty hash_multiset. + + + +-hash_multiset(size_type n) ++hash_multiset(size_type n) + + + Hashed Associative Container +@@ -443,7 +443,7 @@ Creates an empty hash_multiset + + + +-hash_multiset(size_type n, ++hash_multiset(size_type n, + const hasher& h) + + +@@ -458,7 +458,7 @@ Creates an empty hash_multiset + + + +-hash_multiset(size_type n, ++hash_multiset(size_type n, + const hasher& h, + const key_equal& k) + +@@ -475,7 +475,7 @@ Creates an empty hash_multiset + + + template <class InputIterator> +-hash_multiset(InputIterator, InputIterator) ++hash_multiset(InputIterator, InputIterator) + [1] + + +@@ -490,7 +490,7 @@ Creates a hash_multiset with a copy of a + + + template <class InputIterator> +-hash_multiset(InputIterator, InputIterator, ++hash_multiset(InputIterator, InputIterator, + size_type n) + [1] + +@@ -507,7 +507,7 @@ Creates a hash_multiset with a copy of a + + + template <class InputIterator> +-hash_multiset(InputIterator, InputIterator, ++hash_multiset(InputIterator, InputIterator, + size_type n, const hasher& h) + [1] + +@@ -524,7 +524,7 @@ Creates a hash_multiset with a copy of a + + + template <class InputIterator> +-hash_multiset(InputIterator, InputIterator, ++hash_multiset(InputIterator, InputIterator, + size_type n, const hasher& h, + const key_equal& k) + [1] +@@ -541,7 +541,7 @@ Creates a hash_multiset with a copy of a + + + +-hash_multiset(const hash_multiset&) ++hash_multiset(const hash_multiset&) + + + Container +@@ -552,7 +552,7 @@ The copy constructor. + + + +-hash_multiset& operator=(const hash_multiset&) ++hash_multiset& operator=(const hash_multiset&) + + + Container +@@ -563,7 +563,7 @@ The assignment operator + + + +-void swap(hash_multiset&) ++void swap(hash_multiset&) + + + Container +@@ -574,7 +574,7 @@ Swaps the contents of two hash_multisets + + + +-iterator insert(const value_type& x) ++iterator insert(const value_type& x) + + + Multiple Associative Container +@@ -587,7 +587,7 @@ Inserts x into the hash_mul + + + template <class InputIterator> +-void insert(InputIterator, InputIterator) ++void insert(InputIterator, InputIterator) + [1] + + +@@ -600,7 +600,7 @@ Inserts a range into the hash_multis + + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Associative Container +@@ -611,7 +611,7 @@ Erases the element pointed to by pos + + + +-size_type erase(const key_type& k) ++size_type erase(const key_type& k) + + + Associative Container +@@ -622,7 +622,7 @@ Erases the element whose key is k + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Associative Container +@@ -633,7 +633,7 @@ Erases all elements in a range. + + + +-void clear() ++void clear() + + + Associative Container +@@ -644,7 +644,7 @@ Erases all of the elements. + + + +-iterator find(const key_type& k) const ++iterator find(const key_type& k) const + + + Associative Container +@@ -655,7 +655,7 @@ Finds an element whose key is k + + + +-size_type count(const key_type& k) const ++size_type count(const key_type& k) const + + + Associative Container +@@ -668,7 +668,7 @@ Counts the number of elements whose key + + + pair<iterator, iterator> +-equal_range(const key_type& k) const ++equal_range(const key_type& k) const + + + +@@ -681,7 +681,7 @@ Finds a range containing all elements wh + + + +-bool operator==(const hash_multiset&, ++bool operator==(const hash_multiset&, + const hash_multiset&) + + +--- stl-manual-3.30.orig/ostream_iterator.html ++++ stl-manual-3.30/ostream_iterator.html +@@ -111,7 +111,7 @@ Description + + + +-ostream_iterator(ostream&) ++ostream_iterator(ostream&) + + + ostream_iterator +@@ -122,7 +122,7 @@ See below. + + + +-ostream_iterator(ostream&, const char* s) ++ostream_iterator(ostream&, const char* s) + + + ostream_iterator +@@ -133,7 +133,7 @@ See below. + + + +-ostream_iterator(const ostream_iterator&) ++ostream_iterator(const ostream_iterator&) + + + Output Iterator +@@ -144,7 +144,7 @@ The copy constructor + + + +-ostream_iterator& operator=(const ostream_iterator&) ++ostream_iterator& operator=(const ostream_iterator&) + + + Output Iterator +@@ -155,7 +155,7 @@ The assignment operator + + + +-ostream_iterator& operator=(const T&) ++ostream_iterator& operator=(const T&) + + + Output Iterator +@@ -167,7 +167,7 @@ Used to implement the Output Iterator +@@ -179,7 +179,7 @@ Used to implement the Output Iterator +@@ -190,7 +190,7 @@ Preincrement + + + +-ostream_iterator& operator++(int) ++ostream_iterator& operator++(int) + + + Output Iterator +@@ -201,7 +201,7 @@ Postincrement + + + +-output_iterator_tag iterator_category(const ostream_iterator&) ++output_iterator_tag iterator_category(const ostream_iterator&) + + + iterator tags +@@ -226,7 +226,7 @@ Description + + + +-ostream_iterator(ostream& s) ++ostream_iterator(ostream& s) + + + Creates an ostream_iterator such that assignment of t through it +@@ -235,7 +235,7 @@ Creates an ostream_iterator suc + + + +-ostream_iterator(ostream& s, const char* delim) ++ostream_iterator(ostream& s, const char* delim) + + + Creates an ostream_iterator such that assignment of t through it +--- stl-manual-3.30.orig/not_equal_to.html ++++ stl-manual-3.30/not_equal_to.html +@@ -144,7 +144,7 @@ The type of the result: bool + + + +-not_equal_to() ++not_equal_to() + + + DefaultConstructible +@@ -155,7 +155,7 @@ The default constructor. + + + +-bool operator()(const T& x, const T& y) ++bool operator()(const T& x, const T& y) + + + Binary Function +--- stl-manual-3.30.orig/Rope.html ++++ stl-manual-3.30/Rope.html +@@ -346,7 +346,7 @@ Const Sequence +@@ -380,7 +380,7 @@ Creates a rope with a copy of a + + + +-rope(const iterator& f, const iterator& l) ++rope(const iterator& f, const iterator& l) + + + Sequence +@@ -391,7 +391,7 @@ Creates a rope with a copy of a + + + +-rope(const charT* f, const charT* l) ++rope(const charT* f, const charT* l) + + + Sequence +@@ -402,7 +402,7 @@ Creates a rope with a copy of a + + + +-rope(charT c) ++rope(charT c) + + + rope. +@@ -413,7 +413,7 @@ Single-character constructor. + + + +-rope() ++rope() + + + Container +@@ -424,7 +424,7 @@ Default constructor. + + + +-rope(char_producer<charT>*, size_t, bool) ++rope(char_producer<charT>*, size_t, bool) + + + rope +@@ -435,7 +435,7 @@ See below. + + + +-rope(const rope& x) ++rope(const rope& x) + + + Container +@@ -446,7 +446,7 @@ The copy constructor. + + + +-~rope() ++~rope() + + + Container +@@ -457,7 +457,7 @@ The destructor. + + + +-rope& operator=(const rope&x) ++rope& operator=(const rope&x) + + + Container +@@ -468,7 +468,7 @@ The assignment operator. + + + +-void swap(rope& x) ++void swap(rope& x) + + + Container +@@ -479,7 +479,7 @@ Swaps the contents of two ropes + + + +-size_type size() const ++size_type size() const + + + Container +@@ -490,7 +490,7 @@ Returns the size of the rope. + + + +-size_type length() const ++size_type length() const + + + rope +@@ -501,7 +501,7 @@ Same as size + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -512,7 +512,7 @@ Size of longest rope guaranteed + + + +-bool empty() const ++bool empty() const + + + Container +@@ -523,7 +523,7 @@ Equivalent to size() == 0. + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -534,7 +534,7 @@ Returns an const_iterator point + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -545,7 +545,7 @@ Returns an const_iterator point + + + +-iterator mutable_begin() ++iterator mutable_begin() + + + rope +@@ -556,7 +556,7 @@ Returns an iterator pointing to + + + +-iterator mutable_end() ++iterator mutable_end() + + + rope +@@ -567,7 +567,7 @@ Returns an iterator pointing to + + + +-const_reverse_iterator rbegin() const ++const_reverse_iterator rbegin() const + + + Reversible Container +@@ -579,7 +579,7 @@ Returns a const_reverse_iterator + + +-const_reverse_iterator rend() const ++const_reverse_iterator rend() const + + + Reversible Container +@@ -591,7 +591,7 @@ Returns a const_reverse_iterator + + +-iterator mutable_rbegin() ++iterator mutable_rbegin() + + + rope +@@ -603,7 +603,7 @@ Returns a reverse_iterator poin + + + +-iterator mutable_rend() ++iterator mutable_rend() + + + rope +@@ -615,7 +615,7 @@ Returns a reverse_iterator poin + + + +-charT operator[](size_type n) const ++charT operator[](size_type n) const + + + Random Access Container +@@ -626,7 +626,7 @@ Returns the n'th element. + + + +-charT at(size_type pos) const ++charT at(size_type pos) const + + + Random Access Container +@@ -637,7 +637,7 @@ Returns the n'th element. + + + +-reference mutable_reference_at(size_type n) ++reference mutable_reference_at(size_type n) + + + rope +@@ -648,7 +648,7 @@ Returns a reference to the + + + +-int compare(const rope&) const ++int compare(const rope&) const + + + rope. +@@ -659,7 +659,7 @@ Three-way comparison. See below. + + + +-charT front() const ++charT front() const + + + Sequence +@@ -670,7 +670,7 @@ Returns the first element. + + + +-charT back() const ++charT back() const + + + Back Insertion Sequence +@@ -681,7 +681,7 @@ Returns the last element. + + + +-void push_front() ++void push_front() + + + Front Insertion Sequence +@@ -692,7 +692,7 @@ Inserts a new element at the front. + + + +-void push_back(charT) ++void push_back(charT) + + + Back Insertion Sequence +@@ -703,7 +703,7 @@ Inserts a new element at the end. + + + +-void pop_front() ++void pop_front() + + + Front Insertion Sequence +@@ -714,7 +714,7 @@ Removes the first element. + + + +-void pop_back() ++void pop_back() + + + Back Insertion Sequence +@@ -725,7 +725,7 @@ Removes the last element. + + + +-iterator insert(const iterator& p, const rope& x) ++iterator insert(const iterator& p, const rope& x) + + + rope +@@ -736,7 +736,7 @@ Inserts the contents of x befor + + + +-iterator insert(const iterator& p, charT c) ++iterator insert(const iterator& p, charT c) + + + Sequence +@@ -747,7 +747,7 @@ Inserts c before p. + + + +-iterator insert(const iterator& p) ++iterator insert(const iterator& p) + + + Sequence +@@ -758,7 +758,7 @@ Inserts charT() before p + + +-iterator insert(const iterator& p, size_t n, charT c) ++iterator insert(const iterator& p, size_t n, charT c) + + + Sequence +@@ -769,7 +769,7 @@ Inserts n copies of c + + + +-iterator insert(const iterator& p, const charT* s) ++iterator insert(const iterator& p, const charT* s) + + + rope +@@ -780,7 +780,7 @@ Inserts a C string before p. + + + +-iterator insert(const iterator& p, const charT* s, size_t n) ++iterator insert(const iterator& p, const charT* s, size_t n) + + + rope +@@ -792,7 +792,7 @@ Inserts a (not necessarily null-terminat + + + +-iterator insert(const iterator& p, const charT* f, const char* l) ++iterator insert(const iterator& p, const charT* f, const char* l) + + + Sequence +@@ -804,7 +804,7 @@ Inserts the range [f, l) before + + + +-iterator insert(const iterator& p, ++iterator insert(const iterator& p, + const const_iterator& f, const const_iterator& l) + + +@@ -818,7 +818,7 @@ Inserts the range [f, l) before + + + +-iterator insert(const iterator& p, ++iterator insert(const iterator& p, + const iterator& f, const iterator& l) + + +@@ -831,7 +831,7 @@ Inserts the range [f, l) before + + + +-void insert(size_t i, const rope& x) ++void insert(size_t i, const rope& x) + + + rope +@@ -842,7 +842,7 @@ Inserts the contents of x befor + + + +-void insert(size_t i, charT c) ++void insert(size_t i, charT c) + + + rope +@@ -853,7 +853,7 @@ Inserts the character c before + + + +-void insert(size_t i) ++void insert(size_t i) + + + rope +@@ -864,7 +864,7 @@ Inserts the character charT() b + + + +-void insert(size_t i, size_t n, charT c) ++void insert(size_t i, size_t n, charT c) + + + rope +@@ -875,7 +875,7 @@ Inserts n copies of c + + + +-void insert(size_t i, const charT* s) ++void insert(size_t i, const charT* s) + + + rope +@@ -886,7 +886,7 @@ Inserts a C string before the i + + + +-void insert(size_t i, const charT* s, size_t n) ++void insert(size_t i, const charT* s, size_t n) + + + rope +@@ -898,7 +898,7 @@ Inserts a (not necessarily null-terminat + + + +-void insert(size_t i, const charT* f, const charT* l) ++void insert(size_t i, const charT* f, const charT* l) + + + rope +@@ -910,7 +910,7 @@ Inserts the range [f, l) before + + + +-void insert(size_t i, ++void insert(size_t i, + const const_iterator& f, const const_iterator& l) + + +@@ -924,7 +924,7 @@ Inserts the range [f, l) before + + + +-void insert(size_t i, ++void insert(size_t i, + const iterator& f, const iterator& l) + + +@@ -937,7 +937,7 @@ Inserts the range [f, l) before + + + +-void erase(const iterator& p) ++void erase(const iterator& p) + + + Sequence +@@ -948,7 +948,7 @@ Erases the element pointed to by p + + +-void erase(const iterator& f, const iterator& l) ++void erase(const iterator& f, const iterator& l) + + + Sequence +@@ -959,7 +959,7 @@ Erases the range [f, l). + + + +-void erase(size_t i, size_t n) ++void erase(size_t i, size_t n) + + + rope +@@ -970,7 +970,7 @@ Erases n elements, starting wit + + + +-append(const charT* s) ++append(const charT* s) + + + rope +@@ -981,7 +981,7 @@ Appends a C string. + + + +-append(const charT* s, size_t) ++append(const charT* s, size_t) + + + rope +@@ -992,7 +992,7 @@ Appends a (not necessarily null-terminat + + + +-append(const charT* f, const charT* l) ++append(const charT* f, const charT* l) + + + rope +@@ -1003,7 +1003,7 @@ Appends a range. + + + +-append(charT c) ++append(charT c) + + + rope +@@ -1014,7 +1014,7 @@ Appends the character c. + + + +-append() ++append() + + + rope +@@ -1025,7 +1025,7 @@ Appends the character charT(). + + + +-append(size_t n, charT c) ++append(size_t n, charT c) + + + rope +@@ -1036,7 +1036,7 @@ Appends n copies of c. + + + +-append(const rope& x) ++append(const rope& x) + + + rope +@@ -1047,7 +1047,7 @@ Appends the rope x. + + + +-void replace(const iterator& f, const iterator& l, const rope&) ++void replace(const iterator& f, const iterator& l, const rope&) + + + rope +@@ -1058,7 +1058,7 @@ See below. + + + +-void replace(const iterator& f, const iterator& l, charT) ++void replace(const iterator& f, const iterator& l, charT) + + + rope +@@ -1069,7 +1069,7 @@ See below. + + + +-void replace(const iterator& f, const iterator& l, const charT* s) ++void replace(const iterator& f, const iterator& l, const charT* s) + + + rope +@@ -1081,7 +1081,7 @@ See below. + + + +-void replace(const iterator& f, const iterator& l, ++void replace(const iterator& f, const iterator& l, + const charT* s, size_t n) + + +@@ -1095,7 +1095,7 @@ See below. + + + +-void replace(const iterator& f1, const iterator& l1, ++void replace(const iterator& f1, const iterator& l1, + const charT* f2, const charT* l2) + + +@@ -1109,7 +1109,7 @@ See below. + + + +-void replace(const iterator& f1, const iterator& l1, ++void replace(const iterator& f1, const iterator& l1, + const const_iterator& f2, const const_iterator& l2) + + +@@ -1123,7 +1123,7 @@ See below. + + + +-void replace(const iterator& f1, const iterator& l1, ++void replace(const iterator& f1, const iterator& l1, + const iterator& f2, const iterator& l2) + + +@@ -1136,7 +1136,7 @@ See below. + + + +-void replace(const iterator& p, const rope& x) ++void replace(const iterator& p, const rope& x) + + + rope +@@ -1147,7 +1147,7 @@ See below. + + + +-void replace(const iterator& p, charT c) ++void replace(const iterator& p, charT c) + + + rope +@@ -1158,7 +1158,7 @@ See below. + + + +-void replace(const iterator& p, const charT* s) ++void replace(const iterator& p, const charT* s) + + + rope +@@ -1169,7 +1169,7 @@ See below. + + + +-void replace(const iterator& p, const charT* s, size_t n) ++void replace(const iterator& p, const charT* s, size_t n) + + + rope +@@ -1181,7 +1181,7 @@ See below. + + + +-void replace(const iterator& p, ++void replace(const iterator& p, + const charT* f, const charT* l) + + +@@ -1195,7 +1195,7 @@ See below. + + + +-void replace(const iterator& p, ++void replace(const iterator& p, + const_iterator f, const_iterator l) + + +@@ -1209,7 +1209,7 @@ See below. + + + +-void replace(const iterator& p, ++void replace(const iterator& p, + iterator f, iterator l) + + +@@ -1222,7 +1222,7 @@ See below. + + + +-void replace(size_t i, size_t n, const rope& x) ++void replace(size_t i, size_t n, const rope& x) + + + rope +@@ -1233,7 +1233,7 @@ See below. + + + +-void replace(size_t i, size_t n, const charT* s, size_t n) ++void replace(size_t i, size_t n, const charT* s, size_t n) + + + rope +@@ -1244,7 +1244,7 @@ See below. + + + +-void replace(size_t i, size_t n, charT c) ++void replace(size_t i, size_t n, charT c) + + + rope +@@ -1255,7 +1255,7 @@ See below. + + + +-void replace(size_t i, size_t n, const charT* s) ++void replace(size_t i, size_t n, const charT* s) + + + rope +@@ -1267,7 +1267,7 @@ See below. + + + +-void replace(size_t i, size_t n, ++void replace(size_t i, size_t n, + const charT* f, const charT* l) + + +@@ -1281,7 +1281,7 @@ See below. + + + +-void replace(size_t i, size_t n, ++void replace(size_t i, size_t n, + const const_iterator& f, + const const_iterator& l) + +@@ -1296,7 +1296,7 @@ See below. + + + +-void replace(size_t i, size_t n, ++void replace(size_t i, size_t n, + const iterator& f, + const iterator& l) + +@@ -1310,7 +1310,7 @@ See below. + + + +-void replace(size_t i, charT c) ++void replace(size_t i, charT c) + + + rope +@@ -1321,7 +1321,7 @@ See below. + + + +-void replace(size_t i, const rope& x) ++void replace(size_t i, const rope& x) + + + rope +@@ -1332,7 +1332,7 @@ See below. + + + +-void replace(size_t i, const charT* s) ++void replace(size_t i, const charT* s) + + + rope +@@ -1343,7 +1343,7 @@ See below. + + + +-void replace(size_t i, const charT* s, size_t n) ++void replace(size_t i, const charT* s, size_t n) + + + rope +@@ -1354,7 +1354,7 @@ See below. + + + +-void replace(size_t i, const charT* f, const charT* l) ++void replace(size_t i, const charT* f, const charT* l) + + + rope +@@ -1366,7 +1366,7 @@ See below. + + + +-void replace(size_t i, ++void replace(size_t i, + const const_iterator& f, const const_iterator& l) + + +@@ -1380,7 +1380,7 @@ See below. + + + +-void replace(size_t i, ++void replace(size_t i, + const iterator& f, const iterator& l) + + +@@ -1393,7 +1393,7 @@ See below. + + + +-rope substr(iterator f) const ++rope substr(iterator f) const + + + rope +@@ -1404,7 +1404,7 @@ See below. + + + +-rope substr(const_iterator f) const ++rope substr(const_iterator f) const + + + rope +@@ -1415,7 +1415,7 @@ See below. + + + +-rope substr(iterator f, iterator l) const ++rope substr(iterator f, iterator l) const + + + rope +@@ -1426,7 +1426,7 @@ See below. + + + +-rope substr(const_iterator f, const_iterator l) const ++rope substr(const_iterator f, const_iterator l) const + + + rope +@@ -1437,7 +1437,7 @@ See below. + + + +-rope substr(size_t i, size_t n = 1) const ++rope substr(size_t i, size_t n = 1) const + + + rope +@@ -1448,7 +1448,7 @@ See below. + + + +-void copy(charT* buf) const ++void copy(charT* buf) const + + + rope +@@ -1460,7 +1460,7 @@ Copies a rope into an array of charT + + + +-size_type copy(size_type pos, size_type n, ++size_type copy(size_type pos, size_type n, + charT* buf) + + +@@ -1473,7 +1473,7 @@ Copies a rope into an array of charT + + + +-const charT* c_str() const ++const charT* c_str() const + + + rope +@@ -1484,7 +1484,7 @@ See below. + + + +-void delete_c_str() ++void delete_c_str() + + + rope +@@ -1495,7 +1495,7 @@ See below. + + + +-rope operator+(const rope& L, const rope&R) ++rope operator+(const rope& L, const rope&R) + + + rope +@@ -1507,7 +1507,7 @@ Concatenates L and R. + + + +-rope& operator+=(rope& L, const rope& R) ++rope& operator+=(rope& L, const rope& R) + + + rope +@@ -1519,7 +1519,7 @@ Appends R to L. This + + + +-rope operator+(const rope& L, const charT* s) ++rope operator+(const rope& L, const charT* s) + + + rope +@@ -1531,7 +1531,7 @@ Concatenates L and s. + + + +-rope& operator+=(rope& L, const charT* s) ++rope& operator+=(rope& L, const charT* s) + + + rope +@@ -1543,7 +1543,7 @@ Appends s to L. This + + + +-rope operator+(const rope& L, charT c) ++rope operator+(const rope& L, charT c) + + + rope +@@ -1555,7 +1555,7 @@ Concatenates L and c. + + + +-rope& operator+=(rope& L, charT c) ++rope& operator+=(rope& L, charT c) + + + rope +@@ -1567,7 +1567,7 @@ Appends c to L. This + + + +-bool operator<(const rope&, const rope&) ++bool operator<(const rope&, const rope&) + + + Forward Container +@@ -1579,7 +1579,7 @@ Lexicographical comparison. This is a g + + + +-bool operator==(const rope&, const rope*) ++bool operator==(const rope&, const rope*) + + + Forward Container +@@ -1591,7 +1591,7 @@ Tests two ropes for equality. + + + +-ostream& operator<<(ostream& os, rope x) ++ostream& operator<<(ostream& os, rope x) + + + rope +@@ -1616,7 +1616,7 @@ Description + + + +-rope(const charT* s) ++rope(const charT* s) + + + Constructs a rope from a C string. The rope consists of the +@@ -1626,7 +1626,7 @@ Constructs a rope from a C stri + + + +-rope(const charT* s, size_t n) ++rope(const charT* s, size_t n) + + + Constructs a rope from an array of charT. The rope consists of the +@@ -1636,7 +1636,7 @@ Constructs a rope from an array + + + +-rope(charT c) ++rope(charT c) + + + Constructs a rope consisting of the single character c. +@@ -1644,7 +1644,7 @@ Constructs a rope consisting of the sing + + + +-rope(char_producer<charT>* cp, size_t n, bool destroy) ++rope(char_producer<charT>* cp, size_t n, bool destroy) + + + Constructs a rope of size n, whose characters are computed as +@@ -1658,7 +1658,7 @@ Constructs a rope of size n, wh + + + +-size_type length() const ++size_type length() const + + + Synonym for size +@@ -1666,7 +1666,7 @@ Synonym for size + + + +-iterator mutable_begin() ++iterator mutable_begin() + + + Returns an iterator pointing to the beginning of the rope. +@@ -1676,7 +1676,7 @@ Returns an iterator pointing to + + + +-iterator mutable_end() ++iterator mutable_end() + + + Returns an iterator pointing to the end of the rope. +@@ -1686,7 +1686,7 @@ Returns an iterator pointing to + + + +-iterator mutable_rbegin() ++iterator mutable_rbegin() + + + Returns a reverse_iterator pointing to the beginning of the +@@ -1697,7 +1697,7 @@ Returns a reverse_iterator poin + + + +-iterator mutable_rend() ++iterator mutable_rend() + + + Returns a reverse_iterator pointing to the end of the +@@ -1708,7 +1708,7 @@ Returns a reverse_iterator poin + + + +-reference mutable_reference_at(size_type n) ++reference mutable_reference_at(size_type n) + + + Returns a reference to the nth element. This member function +@@ -1718,7 +1718,7 @@ Returns a reference to the + + + +-int compare(const rope& x) ++int compare(const rope& x) + + + Three-way comparison, much like the function strcmp from the +@@ -1730,7 +1730,7 @@ Three-way comparison, much like the func + + + +-iterator insert(const iterator& p, const rope& x) ++iterator insert(const iterator& p, const rope& x) + + + Inserts the contents of the rope x immediately before the +@@ -1739,7 +1739,7 @@ Inserts the contents of the rope + + +-iterator insert(const iterator& p, const charT* s) ++iterator insert(const iterator& p, const charT* s) + + + Inserts a C string immediately before the position p. The +@@ -1750,7 +1750,7 @@ Inserts a C string immediately before th + + + +-iterator insert(const iterator& p, const charT* s, size_t n) ++iterator insert(const iterator& p, const charT* s, size_t n) + + + Inserts an array of charT. The elements that are inserted +@@ -1760,7 +1760,7 @@ Inserts an array of charT. The + + + +-void insert(size_t i, const rope& x) ++void insert(size_t i, const rope& x) + + + Inserts the contents of the rope x immediately before the ith +@@ -1769,7 +1769,7 @@ Inserts the contents of the rope + + +-void insert(size_t i, size_t n, charT c) ++void insert(size_t i, size_t n, charT c) + + + Inserts n copies of c immediately before the ith element. +@@ -1777,7 +1777,7 @@ Inserts n copies of c + + + +-void insert(size_t i, const charT* s) ++void insert(size_t i, const charT* s) + + + Inserts a C string immediately before the ith element. The +@@ -1788,7 +1788,7 @@ Inserts a C string immediately before th + + + +-void insert(size_t i, const charT* s, size_t n) ++void insert(size_t i, const charT* s, size_t n) + + + Inserts an array of charT immediately before the ith element. The +@@ -1798,7 +1798,7 @@ Inserts an array of charT immed + + + +-void insert(size_t i, charT c) ++void insert(size_t i, charT c) + + + Inserts the character c immediately before the ith element. +@@ -1806,7 +1806,7 @@ Inserts the character c immedia + + + +-void insert(size_t i) ++void insert(size_t i) + + + Inserts the character charT() immediately before the ith element. +@@ -1814,7 +1814,7 @@ Inserts the character charT() i + + + +-void insert(size_t i, const charT* f, const charT* l) ++void insert(size_t i, const charT* f, const charT* l) + + + Inserts the range [f, l) immediately before the ith element. +@@ -1823,7 +1823,7 @@ Inserts the range [f, l) immedi + + + +-void insert(size_t i, ++void insert(size_t i, + const const_iterator& f, const const_iterator& l) + + +@@ -1834,7 +1834,7 @@ Inserts the range [f, l) immedi + + + +-void insert(size_t i, ++void insert(size_t i, + const iterator& f, const iterator& l) + + +@@ -1844,7 +1844,7 @@ Inserts the range [f, l) immedi + + + +-void erase(size_t i, size_t n) ++void erase(size_t i, size_t n) + + + Erases n elements, starting with the ith element. +@@ -1852,7 +1852,7 @@ Erases n elements, starting wit + + + +-append(const charT* s) ++append(const charT* s) + + + Adds a C string to the end of the rope. The +@@ -1863,7 +1863,7 @@ Adds a C string to the end of the ro + + + +-append(const charT* s, size_ nt) ++append(const charT* s, size_ nt) + + + Adds an array of charT to the end of the rope. The +@@ -1873,7 +1873,7 @@ Adds an array of charT to the e + + + +-append(const charT* f, const charT* l) ++append(const charT* f, const charT* l) + + + Adds the elements in the range [f, l) to the end of the rope. +@@ -1881,7 +1881,7 @@ Adds the elements in the range [f, l + + + +-append(charT c) ++append(charT c) + + + Adds the character c to the end of the rope. +@@ -1889,7 +1889,7 @@ Adds the character c to the end + + + +-append() ++append() + + + Adds the character charT() to the end of the rope. +@@ -1897,7 +1897,7 @@ Adds the character charT() to t + + + +-append(const rope& x) ++append(const rope& x) + + + Adds the contents of the rope x to the end of *this. +@@ -1905,7 +1905,7 @@ Adds the contents of the rope x + + + +-append(size_t n, charT c) ++append(size_t n, charT c) + + + Adds n copies of c to the end of *this. +@@ -1913,7 +1913,7 @@ Adds n copies of c to + + + +-void replace(const iterator& f, const iterator& l, const rope& x) ++void replace(const iterator& f, const iterator& l, const rope& x) + + + Replaces the elements in the range [f, l) with the elements in x. +@@ -1921,7 +1921,7 @@ Replaces the elements in the range [ + + + +-void replace(const iterator& f, const iterator& l, charT c) ++void replace(const iterator& f, const iterator& l, charT c) + + + Replaces the elements in the range [f, l) with the single +@@ -1930,7 +1930,7 @@ Replaces the elements in the range [ + + + +-void replace(const iterator& f, const iterator& l, const charT* s) ++void replace(const iterator& f, const iterator& l, const charT* s) + + + Replaces the elements in the range [f, l) with a C string: +@@ -1941,7 +1941,7 @@ Replaces the elements in the range [ + + + +-void replace(const iterator& f, const iterator& l, ++void replace(const iterator& f, const iterator& l, + const charT* s, size_t n) + + +@@ -1953,7 +1953,7 @@ Replaces the elements in the range [ + + + +-void replace(const iterator& f1, const iterator& l1, ++void replace(const iterator& f1, const iterator& l1, + const charT* f2, const charT* l2) + + +@@ -1965,7 +1965,7 @@ Replaces the elements in the range [ + + + +-void replace(const iterator& f1, const iterator& l1, ++void replace(const iterator& f1, const iterator& l1, + const const_iterator& f2, const const_iterator& l2) + + +@@ -1977,7 +1977,7 @@ Replaces the elements in the range [ + + + +-void replace(const iterator& f1, const iterator& l1, ++void replace(const iterator& f1, const iterator& l1, + const iterator& f2, const iterator& l2) + + +@@ -1988,7 +1988,7 @@ Replaces the elements in the range [ + + + +-void replace(const iterator& p, const rope& x) ++void replace(const iterator& p, const rope& x) + + + Replaces the element pointed to by p with the elements in x. +@@ -1996,7 +1996,7 @@ Replaces the element pointed to by p + + + +-void replace(const iterator& p, charT c) ++void replace(const iterator& p, charT c) + + + Replaces the element pointed to by p with the single character c. +@@ -2004,7 +2004,7 @@ Replaces the element pointed to by p + + + +-void replace(const iterator& p, const charT* s) ++void replace(const iterator& p, const charT* s) + + + Replaces the element pointed to by p with a C string: +@@ -2014,7 +2014,7 @@ Replaces the element pointed to by p + + + +-void replace(const iterator& p, const charT* s, size_t n) ++void replace(const iterator& p, const charT* s, size_t n) + + + Replaces the element pointed to by p with the elements +@@ -2024,7 +2024,7 @@ Replaces the element pointed to by p + + + +-void replace(const iterator& p, ++void replace(const iterator& p, + const charT* f, const charT* l) + + +@@ -2036,7 +2036,7 @@ Replaces the element pointed to by p + + + +-void replace(const iterator& p, ++void replace(const iterator& p, + const_iterator f, const_iterator l) + + +@@ -2048,7 +2048,7 @@ Replaces the element pointed to by p + + + +-void replace(const iterator& p, ++void replace(const iterator& p, + iterator f, iterator l) + + +@@ -2059,7 +2059,7 @@ Replaces the element pointed to by p + + + +-void replace(size_t i, size_t n, const rope& x) ++void replace(size_t i, size_t n, const rope& x) + + + Replaces the n elements beginning with the ith element +@@ -2068,7 +2068,7 @@ Replaces the n elements beginni + + + +-void replace(size_t i, size_t n, charT c) ++void replace(size_t i, size_t n, charT c) + + + Replaces the n elements beginning with the ith element +@@ -2077,7 +2077,7 @@ Replaces the n elements beginni + + + +-void replace(size_t i, size_t n, const charT* s) ++void replace(size_t i, size_t n, const charT* s) + + + Replaces the n elements beginning with the ith element +@@ -2087,7 +2087,7 @@ Replaces the n elements beginni + + + +-void replace(size_t i, size_t n1, const charT* s, size_t n2) ++void replace(size_t i, size_t n1, const charT* s, size_t n2) + + + Replaces the n1 elements beginning with the ith element +@@ -2097,7 +2097,7 @@ Replaces the n1 elements beginn + + + +-void replace(size_t i, size_t n, ++void replace(size_t i, size_t n, + const charT* f, const charT* l) + + +@@ -2109,7 +2109,7 @@ Replaces the n elements beginni + + + +-void replace(size_t i, size_t n, ++void replace(size_t i, size_t n, + const const_iterator& f, + const const_iterator& l) + +@@ -2122,7 +2122,7 @@ Replaces the n elements beginni + + + +-void replace(size_t i, size_t n, ++void replace(size_t i, size_t n, + const iterator& f, + const iterator& l) + +@@ -2134,7 +2134,7 @@ Replaces the n elements beginni + + + +-void replace(size_t i, charT c) ++void replace(size_t i, charT c) + + + Replaces the ith element with the character c. +@@ -2142,7 +2142,7 @@ Replaces the ith element with t + + + +-void replace(size_t i, const rope& x) ++void replace(size_t i, const rope& x) + + + Replaces the ith element with elements from the rope x. +@@ -2150,7 +2150,7 @@ Replaces the ith element with e + + + +-void replace(size_t i, const charT* s) ++void replace(size_t i, const charT* s) + + + Replaces the ith element with a C string: the sequence of characters beginning with *s and up to, but +@@ -2159,7 +2159,7 @@ Replaces the ith element with a + + + +-void replace(size_t i, const charT* s, size_t n) ++void replace(size_t i, const charT* s, size_t n) + + + Replaces the ith element with the elements in the range [s, s + n). +@@ -2167,7 +2167,7 @@ Replaces the ith element with t + + + +-void replace(size_t i, const charT* f, const charT* l) ++void replace(size_t i, const charT* f, const charT* l) + + + Replaces the ith element with the range [f, l). +@@ -2176,7 +2176,7 @@ Replaces the ith element with t + + + +-void replace(size_t i, ++void replace(size_t i, + const const_iterator& f, const const_iterator& l) + + +@@ -2187,7 +2187,7 @@ Replaces the ith element with t + + + +-void replace(size_t i, ++void replace(size_t i, + const iterator& f, const iterator& l) + + +@@ -2197,7 +2197,7 @@ Replaces the ith element with t + + + +-rope substr(iterator f) const ++rope substr(iterator f) const + + + Returns a new rope with a single element, *f. [4] +@@ -2205,7 +2205,7 @@ Returns a new rope with a singl + + + +-rope substr(const_iterator f) const ++rope substr(const_iterator f) const + + + Returns a new rope with a single element, *f. [4] +@@ -2213,7 +2213,7 @@ Returns a new rope with a singl + + + +-rope substr(iterator f, iterator l) const ++rope substr(iterator f, iterator l) const + + + Returns a new rope that consists of the range [f, l). [4] +@@ -2221,7 +2221,7 @@ Returns a new rope that consist + + + +-rope substr(const_iterator f, const_iterator l) const ++rope substr(const_iterator f, const_iterator l) const + + + Returns a new rope that consists of the range [f, l). [4] +@@ -2229,7 +2229,7 @@ Returns a new rope that consist + + + +-rope substr(size_t i, size_t n = 1) const ++rope substr(size_t i, size_t n = 1) const + + + Returns a new rope whose elements are the n characters +@@ -2238,7 +2238,7 @@ Returns a new rope whose elemen + + + +-void copy(charT* buf) const ++void copy(charT* buf) const + + + Copies the characters in a rope into buf. +@@ -2247,7 +2247,7 @@ Copies the characters in a rope + + + +-size_type copy(size_type pos, size_type n, ++size_type copy(size_type pos, size_type n, + charT* buf) + + +@@ -2259,7 +2259,7 @@ Copies n characters, starting a + + + +-const charT* c_str() const ++const charT* c_str() const + + + Returns a pointer to a null-terminated sequence of characters that +@@ -2271,7 +2271,7 @@ strings is slow: it is linear in the len + + + +-void delete_c_str() ++void delete_c_str() + + + Reclaims the internal storage used by c_str. Note that this +@@ -2280,7 +2280,7 @@ Reclaims the internal storage used by + + +-rope operator+(const rope& L, const rope& R) ++rope operator+(const rope& L, const rope& R) + + + Returns a new rope consisting of the concatenation of L and R. +@@ -2289,7 +2289,7 @@ Returns a new rope consisting o + + + +-rope& operator+=(rope& L, const rope& R) ++rope& operator+=(rope& L, const rope& R) + + + Modifies L by appending R, and returns L. +@@ -2298,7 +2298,7 @@ Modifies L by appending R + + +-rope operator+(const rope& L, const charT* s) ++rope operator+(const rope& L, const charT* s) + + + Returns a new rope consisting of the concatenation of L and all +@@ -2309,7 +2309,7 @@ Returns a new rope consisting o + + + +-rope& operator+=(rope& L, const charT* s) ++rope& operator+=(rope& L, const charT* s) + + + Modifies L by appending the characters from s up to, but +@@ -2319,7 +2319,7 @@ Modifies L by appending the cha + + + +-rope operator+(const rope& L, charT c) ++rope operator+(const rope& L, charT c) + + + Returns a new rope consisting of L with the character c +@@ -2328,7 +2328,7 @@ Returns a new rope consisting o + + + +-rope& operator+=(rope& L, charT c) ++rope& operator+=(rope& L, charT c) + + + Modifies L by appending the character c. This is a global function, +@@ -2337,7 +2337,7 @@ Modifies L by appending the cha + + + +-ostream& operator<<(ostream& os, rope x) ++ostream& operator<<(ostream& os, rope x) + + + Outputs x to the stream os. This is a global function, not +--- stl-manual-3.30.orig/binder2nd.html ++++ stl-manual-3.30/binder2nd.html +@@ -148,7 +148,7 @@ The type of the result: AdaptableBin + + + +-result_type operator()(const argument_type& x) const ++result_type operator()(const argument_type& x) const + + + +@@ -162,7 +162,7 @@ arguments with which this binder1st< + + + +-binder2nd(const AdaptableBinaryFunction& F, ++binder2nd(const AdaptableBinaryFunction& F, + AdaptableBinaryFunction::second_argument_type c) + + +@@ -178,7 +178,7 @@ See below + + template <class AdaptableBinaryFunction, class T> + binder2nd<AdaptableBinaryFunction> +-bind2nd(const AdaptableBinaryFunction& F, const T& c); ++bind2nd(const AdaptableBinaryFunction& F, const T& c); + + + +@@ -206,7 +206,7 @@ Description + + + +-binder2nd(const AdaptableBinaryFunction& F, ++binder2nd(const AdaptableBinaryFunction& F, + AdaptableBinaryFunction::second_argument_type c) + + +@@ -222,7 +222,7 @@ call F(x, c). + + template <class AdaptableBinaryFunction, class T> + binder2nd<AdaptableBinaryFunction> +-bind2nd(const AdaptableBinaryFunction& F, const T& c); ++bind2nd(const AdaptableBinaryFunction& F, const T& c); + + + +--- stl-manual-3.30.orig/times.html ++++ stl-manual-3.30/times.html +@@ -155,7 +155,7 @@ The type of the result: T + + + +-T operator()(const T& x, const T& y) ++T operator()(const T& x, const T& y) + + + Adaptable Binary Function +@@ -166,7 +166,7 @@ Function call operator. The return valu + + + +-multiplies() [1] ++multiplies() [1] + + + Default Constructible +--- stl-manual-3.30.orig/back_insert_iterator.html ++++ stl-manual-3.30/back_insert_iterator.html +@@ -117,7 +117,7 @@ Description + + + +-back_insert_iterator(BackInsertionSequence&) ++back_insert_iterator(BackInsertionSequence&) + + + back_insert_iterator +@@ -128,7 +128,7 @@ See below. + + + +-back_insert_iterator(const back_insert_iterator&) ++back_insert_iterator(const back_insert_iterator&) + + + Trivial Iterator +@@ -141,7 +141,7 @@ The copy constructor + + + back_insert_iterator& +-operator=(const back_insert_iterator&) ++operator=(const back_insert_iterator&) + + + +@@ -153,7 +153,7 @@ The assignment operator + + + +-back_insert_iterator& operator*() ++back_insert_iterator& operator*() + + + Output Iterator +@@ -166,7 +166,7 @@ Used to implement the + + +-back_insert_iterator& operator++() ++back_insert_iterator& operator++() + + + Output Iterator +@@ -189,7 +189,7 @@ Preincrement. + + + +-back_insert_iterator& operator++(int) ++back_insert_iterator& operator++(int) + + + Output Iterator +@@ -202,7 +202,7 @@ Postincrement. + + + output_iterator_tag +-iterator_category(const back_insert_iterator&) ++iterator_category(const back_insert_iterator&) + + + +@@ -218,7 +218,7 @@ Returns the iterator's category. + + template<class BackInsertionSequence> + back_insert_iterator<BackInsertionSequence> +-back_inserter(BackInsertionSequence& S) ++back_inserter(BackInsertionSequence& S) + + + +@@ -244,7 +244,7 @@ Description + + + +-back_insert_iterator(BackInsertionSequence& S) ++back_insert_iterator(BackInsertionSequence& S) + + + Constructs a back_insert_iterator that inserts objects +@@ -257,7 +257,7 @@ Constructs a back_insert_iterator + template<class BackInsertionSequence> + back_insert_iterator<BackInsertionSequence> +-back_inserter(BackInsertionSequence& S); ++back_inserter(BackInsertionSequence& S); + + + +--- stl-manual-3.30.orig/equal_to.html ++++ stl-manual-3.30/equal_to.html +@@ -143,7 +143,7 @@ The type of the result: bool + + + +-equal_to() ++equal_to() + + + DefaultConstructible +@@ -154,7 +154,7 @@ The default constructor. + + + +-bool operator()(const T& x, const T& y) ++bool operator()(const T& x, const T& y) + + + Binary Function +--- stl-manual-3.30.orig/char_traits.html ++++ stl-manual-3.30/char_traits.html +@@ -163,7 +163,7 @@ Description + + + +-static void assign(char_type& c1, const char_type& c2) ++static void assign(char_type& c1, const char_type& c2) + + + Character Traits +@@ -174,7 +174,7 @@ Assigns c2 to c1. + + + +-static bool eq(const char_type& c1, const char_type& c2) ++static bool eq(const char_type& c1, const char_type& c2) + + + Character Traits +@@ -185,7 +185,7 @@ Character equality. + + + +-static bool lt(const char_type& c1, const char_type& c2) ++static bool lt(const char_type& c1, const char_type& c2) + + + Character Traits +@@ -196,7 +196,7 @@ Returns true if c1 is + + + +-static int compare(const char_type* p1, const char_type* p2, size_t n) ++static int compare(const char_type* p1, const char_type* p2, size_t n) + + + Character Traits +@@ -207,10 +207,10 @@ Three-way lexicographical comparison, mu + + + +-Length ++static size_t length(const char* p) + + +-static size_t length(const char* p) ++ Character Traits + + + Returns length of a null-terminated array of characters. +@@ -218,7 +218,7 @@ Returns length of a null-terminated arra + + + +-static const char_type* find(const char_type* p, size_t n, const char_type& c) ++static const char_type* find(const char_type* p, size_t n, const char_type& c) + + + Character Traits +@@ -229,7 +229,7 @@ Finds c in [p, p+n), r + + + +-static char_type* move(char_type* s, const char_type* p, size_t n) ++static char_type* move(char_type* s, const char_type* p, size_t n) + + + Character Traits +@@ -241,7 +241,7 @@ Copies characters from [p, p+n) + + + +-static char_type* copy(char_type* s, const char_type* p, size_t n) ++static char_type* copy(char_type* s, const char_type* p, size_t n) + + + Character Traits +@@ -253,7 +253,7 @@ Copies characters from [p, p+n) + + + +-static char_type* assign(char_type* s, size_t n, char_type c) ++static char_type* assign(char_type* s, size_t n, char_type c) + + + Character Traits +@@ -264,7 +264,7 @@ Assigns the value c to every el + + + +-static int_type eof() ++static int_type eof() + + + Character Traits +@@ -275,7 +275,7 @@ Returns the value used as an EOF indicat + + + +-static int_type not_eof(const int_type& c) ++static int_type not_eof(const int_type& c) + + + Character Traits +@@ -287,7 +287,7 @@ Returns a value that is not equal to + + +-static char_type to_char_type(const int_type& c) ++static char_type to_char_type(const int_type& c) + + + Character Traits +@@ -299,7 +299,7 @@ Returns the char_type value cor + + + +-static int_type to_int_type(const char_type& c) ++static int_type to_int_type(const char_type& c) + + + Character Traits +@@ -310,7 +310,7 @@ Returns a int_type representati + + + +-static bool eq_int_type(cosnt int_type& c1, const int_type& c1) ++static bool eq_int_type(cosnt int_type& c1, const int_type& c1) + + + Character Traits +--- stl-manual-3.30.orig/stack.html ++++ stl-manual-3.30/stack.html +@@ -176,7 +176,7 @@ See below. + + + +-stack() ++stack() + + + Default Constructible +@@ -187,7 +187,7 @@ The default constructor. Creates an emp + + + +-stack(const stack&) ++stack(const stack&) + + + Assignable +@@ -198,7 +198,7 @@ The copy constructor. + + + +-stack& operator=(const stack&) ++stack& operator=(const stack&) + + + Assignable +@@ -209,7 +209,7 @@ The assignment operator. + + + +-bool empty() const ++bool empty() const + + + stack +@@ -220,7 +220,7 @@ See below. + + + +-size_type size() const ++size_type size() const + + + stack +@@ -231,7 +231,7 @@ See below. + + + +-value_type& top() ++value_type& top() + + + stack +@@ -242,7 +242,7 @@ See below. + + + +-const value_type& top() const ++constvalue_type& top() const + + + stack +@@ -253,7 +253,7 @@ See below. + + + +-void push(const value_type&) ++void push(const value_type&) + + + stack +@@ -264,7 +264,7 @@ See below. + + + +-void pop() [3] ++void pop() [3] + + + stack +@@ -275,7 +275,7 @@ See below. + + + +-bool operator==(const stack&, const stack&) ++bool operator==(const stack&, const stack&) + + + stack +@@ -286,7 +286,7 @@ See below. + + + +-bool operator<(const stack&, const stack&) ++bool operator<(const stack&, const stack&) + + + stack +@@ -328,7 +328,7 @@ An unsigned integral type. This is the + + + +-bool empty() const ++bool empty() const + + + Returns true if the stack contains no elements, and false +@@ -337,7 +337,7 @@ Returns true if the stack + + +-size_type size() const ++size_type size() const + + + Returns the number of elements contained in the stack. +@@ -345,7 +345,7 @@ Returns the number of elements contained + + + +-value_type& top() ++value_type& top() + + + Returns a mutable reference to the element at the top of the stack. +@@ -354,7 +354,7 @@ Returns a mutable reference to the eleme + + + +-const value_type& top() const ++constvalue_type& top() const + + + Returns a const reference to the element at the top of the stack. +@@ -363,7 +363,7 @@ Returns a const reference to the element + + + +-void push(const value_type& x) ++void push(const value_type& x) + + + Inserts x at the top of the stack. Postconditions: size() will +@@ -372,7 +372,7 @@ Inserts x at the top of the sta + + + +-void pop() ++void pop() + + + Removes the element at the top of the stack. [3] Precondition: +@@ -382,7 +382,7 @@ Removes the element at the top of the st + + + +-bool operator==(const stack&, const stack&) ++bool operator==(const stack&, const stack&) + + + Compares two stacks for equality. Two stacks are equal if they +@@ -392,7 +392,7 @@ Compares two stacks for equality. Two s + + + +-bool operator<(const stack&, const stack&) ++bool operator<(const stack&, const stack&) + + + Lexicographical ordering of two stacks. +--- stl-manual-3.30.orig/plus.html ++++ stl-manual-3.30/plus.html +@@ -151,7 +151,7 @@ The type of the result: T + + + +-T operator()(const T& x, const T& y) ++T operator()(const T& x, const T& y) + + + Adaptable Binary Function +@@ -162,7 +162,7 @@ Function call operator. The return valu + + + +-plus() ++plus() + + + Default Constructible +--- stl-manual-3.30.orig/divides.html ++++ stl-manual-3.30/divides.html +@@ -151,7 +151,7 @@ The type of the result: T + + + +-T operator()(const T& x, const T& y) ++T operator()(const T& x, const T& y) + + + Adaptable Binary Function +@@ -162,7 +162,7 @@ Function call operator. The return valu + + + +-divides() ++divides() + + + Default Constructible +--- stl-manual-3.30.orig/Map.html ++++ stl-manual-3.30/Map.html +@@ -344,7 +344,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() ++iterator begin() + + + Container +@@ -355,7 +355,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -366,7 +366,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -377,7 +377,7 @@ Returns a const_iterator pointi + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -388,7 +388,7 @@ Returns a const_iterator pointi + + + +-reverse_iterator rbegin() ++reverse_iterator rbegin() + + + Reversible Container +@@ -400,7 +400,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() ++reverse_iterator rend() + + + Reversible Container +@@ -412,7 +412,7 @@ Returns a reverse_iterator poin + + + +-const_reverse_iterator rbegin() const ++const_reverse_iterator rbegin() const + + + Reversible Container +@@ -424,7 +424,7 @@ Returns a const_reverse_iterator + + +-const_reverse_iterator rend() const ++const_reverse_iterator rend() const + + + Reversible Container +@@ -436,7 +436,7 @@ Returns a const_reverse_iterator + + +-size_type size() const ++size_type size() const + + + Container +@@ -447,7 +447,7 @@ Returns the size of the map. + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -458,7 +458,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -469,7 +469,7 @@ Returns the largest possible size of the + + + +-key_compare key_comp() const ++key_compare key_comp() const + + + Sorted Associative Container +@@ -480,7 +480,7 @@ Returns the key_compare object + + + +-value_compare value_comp() const ++value_compare value_comp() const + + + Sorted Associative Container +@@ -491,7 +491,7 @@ Returns the value_compare objec + + + +-map() ++map() + + + Container +@@ -502,7 +502,7 @@ Creates an empty map. + + + +-map(const key_compare& comp) ++map(const key_compare& comp) + + + Sorted Associative Container +@@ -515,7 +515,7 @@ Creates an empty map, using + + template <class InputIterator> +-map(InputIterator f, InputIterator l) ++map(InputIterator f, InputIterator l) + [2] + + +@@ -530,7 +530,7 @@ Creates a map with a copy of a range. + + + template <class InputIterator> +-map(InputIterator f, InputIterator l, ++map(InputIterator f, InputIterator l, + const key_compare& comp) + [2] + +@@ -545,7 +545,7 @@ Creates a map with a copy of a range, us + + + +-map(const map&) ++map(const map&) + + + Container +@@ -556,7 +556,7 @@ The copy constructor. + + + +-map& operator=(const map&) ++map& operator=(const map&) + + + Container +@@ -567,7 +567,7 @@ The assignment operator + + + +-void swap(map&) ++void swap(map&) + + + Container +@@ -580,7 +580,7 @@ Swaps the contents of two maps. + + + pair<iterator, bool> +-insert(const value_type& x) ++insert(const value_type& x) + + + +@@ -593,7 +593,7 @@ Inserts x into the map + + + +-iterator insert(iterator pos, ++iterator insert(iterator pos, + const value_type& x) + + +@@ -609,7 +609,7 @@ Inserts x into the map + + + template <class InputIterator> +-void insert(InputIterator, InputIterator) ++void insert(InputIterator, InputIterator) + [2] + + +@@ -622,7 +622,7 @@ Inserts a range into the map. + + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Associative Container +@@ -633,7 +633,7 @@ Erases the element pointed to by pos + + + +-size_type erase(const key_type& k) ++size_type erase(const key_type& k) + + + Associative Container +@@ -644,7 +644,7 @@ Erases the element whose key is k + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Associative Container +@@ -655,7 +655,7 @@ Erases all elements in a range. + + + +-void clear() ++void clear() + + + Associative Container +@@ -666,7 +666,7 @@ Erases all of the elements. + + + +-iterator find(const key_type& k) ++iterator find(const key_type& k) + + + Associative Container +@@ -677,7 +677,7 @@ Finds an element whose key is k + + + +-const_iterator find(const key_type& k) const ++const_iterator find(const key_type& k) const + + + Associative Container +@@ -688,7 +688,7 @@ Finds an element whose key is k + + + +-size_type count(const key_type& k) ++size_type count(const key_type& k) + + + Unique Associative Container +@@ -699,7 +699,7 @@ Counts the number of elements whose key + + + +-iterator lower_bound(const key_type& k) ++iterator lower_bound(const key_type& k) + + + Sorted Associative Container +@@ -710,7 +710,7 @@ Finds the first element whose key is not + + + +-const_iterator lower_bound(const key_type& k) const ++const_iterator lower_bound(const key_type& k) const + + + Sorted Associative Container +@@ -721,7 +721,7 @@ Finds the first element whose key is not + + + +-iterator upper_bound(const key_type& k) ++iterator upper_bound(const key_type& k) + + + Sorted Associative Container +@@ -732,7 +732,7 @@ Finds the first element whose key greate + + + +-const_iterator upper_bound(const key_type& k) const ++const_iterator upper_bound(const key_type& k) const + + + Sorted Associative Container +@@ -745,7 +745,7 @@ Finds the first element whose key greate + + + pair<iterator, iterator> +-equal_range(const key_type& k) ++equal_range(const key_type& k) + + + +@@ -759,7 +759,7 @@ Finds a range containing all elements wh + + + pair<const_iterator, const_iterator> +-equal_range(const key_type& k) const ++equal_range(const key_type& k) const + + + +@@ -773,7 +773,7 @@ Finds a range containing all elements wh + + + data_type& +-operator[](const key_type& k) [3] ++operator[](const key_type& k) [3] + + + +@@ -786,7 +786,7 @@ See below. + + + +-bool operator==(const map&, ++bool operator==(const map&, + const map&) + + +@@ -801,7 +801,7 @@ Tests two maps for equality. This is a + + + +-bool operator<(const map&, ++bool operator<(const map&, + const map&) + + +@@ -831,7 +831,7 @@ Description + + + data_type& +-operator[](const key_type& k) [3] ++operator[](const key_type& k) [3] + + + +--- stl-manual-3.30.orig/sequence_buffer.html ++++ stl-manual-3.30/sequence_buffer.html +@@ -182,7 +182,7 @@ The underlying container's value type. + + + +-sequence_buffer(Container& C) ++sequence_buffer(Container& C) + + + sequence_buffer +@@ -193,7 +193,7 @@ Create a sequence_buffer whose + + + +-sequence_buffer() ++sequence_buffer() + + + Default Constructible +@@ -204,7 +204,7 @@ The default constructor. The resulting + + + +-sequence_buffer(const sequence_buffer&) ++sequence_buffer(const sequence_buffer&) + + + Assignable +@@ -215,7 +215,7 @@ Copy constructor. + + + +-sequence_buffer& operator=(const sequence_buffer& s) ++sequence_buffer& operator=(const sequence_buffer& s) + + + Assignable +@@ -226,7 +226,7 @@ Assignment operator. + + + +-sequence_buffer& operator=(sequence_buffer& s) ++sequence_buffer& operator=(sequence_buffer& s) + + + Assignable +@@ -237,7 +237,7 @@ Faster version of assignment operator. + + + +-sequence_buffer& operator=(const value_type&) ++sequence_buffer& operator=(const value_type&) + + + Output Iterator +@@ -249,7 +249,7 @@ Used to implement the Output Iterator +@@ -261,7 +261,7 @@ Used to implement the Output Iterator +@@ -272,7 +272,7 @@ Preincrement + + + +-sequence_buffer& operator++(int) ++sequence_buffer& operator++(int) + + + Output Iterator +@@ -283,7 +283,7 @@ Postincrement + + + +-void flush() ++void flush() + + + sequence_buffer +@@ -294,18 +294,18 @@ Flush the buffer. + + + +-void push_back(value_type) ++void push_back(value_type) + + + sequence_buffer + + +-i.push_back(x) is equivalent to *i = x. ++i.push_back(x) is equivalent to *i = x. + + + + +-void append(value_type* s, size_t len) ++void append(value_type* s, size_t len) + + + sequence_buffer +@@ -339,7 +339,7 @@ The underlying container's value type. + + + +-sequence_buffer(Container& C) ++sequence_buffer(Container& C) + + + Create a sequence_buffer whose underlying container is C. +@@ -349,7 +349,7 @@ Create a sequence_buffer whose + + + +-void flush() ++void flush() + + + Append all elements in the buffer to the underlying container, and +@@ -362,7 +362,7 @@ Append all elements in the buffer to the + + + +-void push_back(value_type x) ++void push_back(value_type x) + + + Append x to the sequence_buffer. Note that this member function is +@@ -372,7 +372,7 @@ Append x to the sequence_bu + + + +-void append(value_type* s, size_t len) ++void append(value_type* s, size_t len) + + + Append the range [s, s + len) to the sequence_buffer. Note +--- stl-manual-3.30.orig/set.html ++++ stl-manual-3.30/set.html +@@ -360,7 +360,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() const ++iterator begin() const + + + Container +@@ -371,7 +371,7 @@ Returns an iterator pointing to + + + +-iterator end() const ++iterator end() const + + + Container +@@ -382,7 +382,7 @@ Returns an iterator pointing to + + + +-reverse_iterator rbegin() const ++reverse_iterator rbegin() const + + + Reversible Container +@@ -394,7 +394,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() const ++reverse_iterator rend() const + + + Reversible Container +@@ -406,7 +406,7 @@ Returns a reverse_iterator poin + + + +-size_type size() const ++size_type size() const + + + Container +@@ -417,7 +417,7 @@ Returns the size of the set. + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -428,7 +428,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -439,7 +439,7 @@ Returns the largest possible size of the + + + +-key_compare key_comp() const ++key_compare key_comp() const + + + Sorted Associative Container +@@ -450,7 +450,7 @@ Returns the key_compare object + + + +-value_compare value_comp() const ++value_compare value_comp() const + + + Sorted Associative Container +@@ -461,7 +461,7 @@ Returns the value_compare objec + + + +-set() ++set() + + + Container +@@ -472,7 +472,7 @@ Creates an empty set. + + + +-set(const key_compare& comp) ++set(const key_compare& comp) + + + Sorted Associative Container +@@ -485,7 +485,7 @@ Creates an empty set, using + + template <class InputIterator> +-set(InputIterator f, InputIterator l) ++set(InputIterator f, InputIterator l) + [1] + + +@@ -500,7 +500,7 @@ Creates a set with a copy of a range. + + + template <class InputIterator> +-set(InputIterator f, InputIterator l, ++set(InputIterator f, InputIterator l, + const key_compare& comp) + [1] + +@@ -515,7 +515,7 @@ Creates a set with a copy of a range, us + + + +-set(const set&) ++set(const set&) + + + Container +@@ -526,7 +526,7 @@ The copy constructor. + + + +-set& operator=(const set&) ++set& operator=(const set&) + + + Container +@@ -537,7 +537,7 @@ The assignment operator + + + +-void swap(set&) ++void swap(set&) + + + Container +@@ -550,7 +550,7 @@ Swaps the contents of two sets. + + + pair<iterator, bool> +-insert(const value_type& x) ++insert(const value_type& x) + + + +@@ -563,7 +563,7 @@ Inserts x into the set + + + +-iterator insert(iterator pos, ++iterator insert(iterator pos, + const value_type& x) + + +@@ -579,7 +579,7 @@ Inserts x into the set + + + template <class InputIterator> +-void insert(InputIterator, InputIterator) ++void insert(InputIterator, InputIterator) + [1] + + +@@ -592,7 +592,7 @@ Inserts a range into the set. + + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Associative Container +@@ -603,7 +603,7 @@ Erases the element pointed to by pos + + + +-size_type erase(const key_type& k) ++size_type erase(const key_type& k) + + + Associative Container +@@ -614,7 +614,7 @@ Erases the element whose key is k + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Associative Container +@@ -625,7 +625,7 @@ Erases all elements in a range. + + + +-void clear() ++void clear() + + + Associative Container +@@ -636,7 +636,7 @@ Erases all of the elements. + + + +-iterator find(const key_type& k) const ++iterator find(const key_type& k) const + + + Associative Container +@@ -647,7 +647,7 @@ Finds an element whose key is k + + + +-size_type count(const key_type& k) const ++size_type count(const key_type& k) const + + + Unique Associative Container +@@ -658,7 +658,7 @@ Counts the number of elements whose key + + + +-iterator lower_bound(const key_type& k) const ++iterator lower_bound(const key_type& k) const + + + Sorted Associative Container +@@ -669,7 +669,7 @@ Finds the first element whose key is not + + + +-iterator upper_bound(const key_type& k) const ++iterator upper_bound(const key_type& k) const + + + Sorted Associative Container +@@ -682,7 +682,7 @@ Finds the first element whose key greate + + + pair<iterator, iterator> +-equal_range(const key_type& k) const ++equal_range(const key_type& k) const + + + +@@ -695,7 +695,7 @@ Finds a range containing all elements wh + + + +-bool operator==(const set&, ++bool operator==(const set&, + const set&) + + +@@ -710,7 +710,7 @@ Tests two sets for equality. This is a + + + +-bool operator<(const set&, ++bool operator<(const set&, + const set&) + + +--- stl-manual-3.30.orig/minus.html ++++ stl-manual-3.30/minus.html +@@ -151,7 +151,7 @@ The type of the result: T + + + +-T operator()(const T& x, const T& y) ++T operator()(const T& x, const T& y) + + + Adaptable Binary Function +@@ -162,7 +162,7 @@ Function call operator. The return valu + + + +-minus() ++minus() + + + Default Constructible +--- stl-manual-3.30.orig/unary_negate.html ++++ stl-manual-3.30/unary_negate.html +@@ -144,7 +144,7 @@ The type of the result: bool + + + +-bool operator()(argument_type) ++bool operator()(argument_type) + + + Unary Function +@@ -156,7 +156,7 @@ Function call operator. + + + +-unary_negate(const AdaptablePredicate& pred) ++unary_negate(const AdaptablePredicate& pred) + + + +@@ -171,7 +171,7 @@ See below. + + template <class AdaptablePredicate> + unary_negate<AdaptablePredicate> +-not1(const AdaptablePredicate& pred); ++not1(const AdaptablePredicate& pred); + + + +@@ -199,7 +199,7 @@ Description + + + +-unary_negate(const AdaptablePredicate& pred) ++unary_negate(const AdaptablePredicate& pred) + + + +@@ -212,12 +212,12 @@ whose underlying predicate is pred + template <class AdaptablePredicate> + unary_negate<AdaptablePredicate> +-not1(const AdaptablePredicate& pred); ++not1(const AdaptablePredicate& pred); + + + + If p is of type AdaptablePredicate then +-not1(p) is equivalent to unary_negate<AdaptablePredicate>(p), ++not1(p) is equivalent to unary_negate<AdaptablePredicate>(p), + but more convenient. This is a global function, not a member + function. + +--- stl-manual-3.30.orig/distance_type.html ++++ stl-manual-3.30/distance_type.html +@@ -50,18 +50,18 @@ + Distance_type is overloaded; it is in fact five different functions. + + template <class T, class Distance> +-inline Distance* distance_type(const input_iterator<T, Distance>&); ++inline Distance* distance_type(const input_iterator<T, Distance>&); + + template <class T, class Distance> +-inline Distance* distance_type(const forward_iterator<T, Distance>&); ++inline Distance* distance_type(const forward_iterator<T, Distance>&); + + template <class T, class Distance> +-inline Distance* distance_type(const bidirectional_iterator<T, Distance>&); ++inline Distance* distance_type(const bidirectional_iterator<T, Distance>&); + + template <class T, class Distance> +-inline Distance* distance_type(const random_access_iterator<T, Distance>&); ++inline Distance* distance_type(const random_access_iterator<T, Distance>&); + +-template <class T> inline ptrdiff_t* distance_type(const T*); ++template <class T> inline ptrdiff_t* distance_type(const T*); + + Description + Distance_type is an iterator tag function: it is used to +--- stl-manual-3.30.orig/identity.html ++++ stl-manual-3.30/identity.html +@@ -130,7 +130,7 @@ The type of the result: T. + + +-const T& operator()(const T&) const ++constT& operator()(const T&) const + + + Adaptable Unary Function +--- stl-manual-3.30.orig/hash_map.html ++++ stl-manual-3.30/hash_map.html +@@ -336,7 +336,7 @@ Const iterator used to iterate through a + + + +-iterator begin() ++iterator begin() + + + Container +@@ -347,7 +347,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -358,7 +358,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -369,7 +369,7 @@ Returns an const_iterator point + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -380,7 +380,7 @@ Returns an const_iterator point + + + +-size_type size() const ++size_type size() const + + + Container +@@ -391,7 +391,7 @@ Returns the size of the hash_map + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -402,7 +402,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -413,7 +413,7 @@ Returns the largest possible size of the + + + +-size_type bucket_count() const ++size_type bucket_count() const + + + Hashed Associative Container +@@ -424,7 +424,7 @@ Returns the number of buckets used by th + + + +-void resize(size_type n) ++void resize(size_type n) + + + Hashed Associative Container +@@ -435,7 +435,7 @@ Increases the bucket count to at least < + + + +-hasher hash_funct() const ++hasher hash_funct() const + + + Hashed Associative Container +@@ -446,7 +446,7 @@ Returns the hasher object used + + + +-key_equal key_eq() const ++key_equal key_eq() const + + + Hashed Associative Container +@@ -457,7 +457,7 @@ Returns the key_equal object us + + + +-hash_map() ++hash_map() + + + Container +@@ -468,7 +468,7 @@ Creates an empty hash_map. + + + +-hash_map(size_type n) ++hash_map(size_type n) + + + Hashed Associative Container +@@ -480,7 +480,7 @@ Creates an empty hash_map with + + + +-hash_map(size_type n, ++hash_map(size_type n, + const hasher& h) + + +@@ -495,7 +495,7 @@ Creates an empty hash_map with + + + +-hash_map(size_type n, ++hash_map(size_type n, + const hasher& h, + const key_equal& k) + +@@ -512,7 +512,7 @@ Creates an empty hash_map with + + + template <class InputIterator> +-hash_map(InputIterator f, InputIterator l) ++hash_map(InputIterator f, InputIterator l) + [2] + + +@@ -527,7 +527,7 @@ Creates a hash_map with a copy of a rang + + + template <class InputIterator> +-hash_map(InputIterator f, InputIterator l, ++hash_map(InputIterator f, InputIterator l, + size_type n) + [2] + +@@ -544,7 +544,7 @@ Creates a hash_map with a copy of a rang + + + template <class InputIterator> +-hash_map(InputIterator f, InputIterator l, ++hash_map(InputIterator f, InputIterator l, + size_type n, const hasher& h) + [2] + +@@ -561,7 +561,7 @@ Creates a hash_map with a copy of a rang + + + template <class InputIterator> +-hash_map(InputIterator f, InputIterator l, ++hash_map(InputIterator f, InputIterator l, + size_type n, const hasher& h, + const key_equal& k) + [2] +@@ -578,7 +578,7 @@ Creates a hash_map with a copy of a rang + + + +-hash_map(const hash_map&) ++hash_map(const hash_map&) + + + Container +@@ -589,7 +589,7 @@ The copy constructor. + + + +-hash_map& operator=(const hash_map&) ++hash_map& operator=(const hash_map&) + + + Container +@@ -600,7 +600,7 @@ The assignment operator + + + +-void swap(hash_map&) ++void swap(hash_map&) + + + Container +@@ -613,7 +613,7 @@ Swaps the contents of two hash_maps. + + + pair<iterator, bool> +-insert(const value_type& x) ++insert(const value_type& x) + + + +@@ -627,7 +627,7 @@ Inserts x into the hash_map + + + template <class InputIterator> +-void insert(InputIterator f, InputIterator l) ++void insert(InputIterator f, InputIterator l) + [2] + + +@@ -640,7 +640,7 @@ Inserts a range into the hash_map + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Associative Container +@@ -651,7 +651,7 @@ Erases the element pointed to by pos + + + +-size_type erase(const key_type& k) ++size_type erase(const key_type& k) + + + Associative Container +@@ -662,7 +662,7 @@ Erases the element whose key is k + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Associative Container +@@ -673,7 +673,7 @@ Erases all elements in a range. + + + +-void clear() ++void clear() + + + Associative Container +@@ -684,7 +684,7 @@ Erases all of the elements. + + + +-const_iterator find(const key_type& k) const ++const_iterator find(const key_type& k) const + + + Associative Container +@@ -695,7 +695,7 @@ Finds an element whose key is k + + + +-iterator find(const key_type& k) ++iterator find(const key_type& k) + + + Associative Container +@@ -706,7 +706,7 @@ Finds an element whose key is k + + + +-size_type count(const key_type& k) const ++size_type count(const key_type& k) const + + + Unique Associative Container +@@ -719,7 +719,7 @@ Counts the number of elements whose key + + + pair<const_iterator, const_iterator> +-equal_range(const key_type& k) const ++equal_range(const key_type& k) const + + + +@@ -733,7 +733,7 @@ Finds a range containing all elements wh + + + pair<iterator, iterator> +-equal_range(const key_type& k) ++equal_range(const key_type& k) + + + +@@ -747,7 +747,7 @@ Finds a range containing all elements wh + + + data_type& +-operator[](const key_type& k) [3] ++operator[](const key_type& k) [3] + + + +@@ -760,7 +760,7 @@ See below. + + + +-bool operator==(const hash_map&, ++bool operator==(const hash_map&, + const hash_map&) + + +@@ -792,7 +792,7 @@ Description + + + data_type& +-operator[](const key_type& k) [3] ++operator[](const key_type& k) [3] + + + +--- stl-manual-3.30.orig/List.html ++++ stl-manual-3.30/List.html +@@ -247,7 +247,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() ++iterator begin() + + + Container +@@ -258,7 +258,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -269,7 +269,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -280,7 +280,7 @@ Returns a const_iterator pointi + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -291,7 +291,7 @@ Returns a const_iterator pointi + + + +-reverse_iterator rbegin() ++reverse_iterator rbegin() + + + Reversible Container +@@ -303,7 +303,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() ++reverse_iterator rend() + + + Reversible Container +@@ -315,7 +315,7 @@ Returns a reverse_iterator poin + + + +-const_reverse_iterator rbegin() const ++const_reverse_iterator rbegin() const + + + Reversible Container +@@ -327,7 +327,7 @@ Returns a const_reverse_iterator + + +-const_reverse_iterator rend() const ++const_reverse_iterator rend() const + + + Reversible Container +@@ -339,7 +339,7 @@ Returns a const_reverse_iterator + + +-size_type size() const ++size_type size() const + + + Container +@@ -354,7 +354,7 @@ Returns the size of the list. + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -365,7 +365,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -376,7 +376,7 @@ Returns the largest possible size of the + + + +-list() ++list() + + + Container +@@ -387,7 +387,7 @@ Creates an empty list. + + + +-list(size_type n) ++list(size_type n) + + + Sequence +@@ -398,7 +398,7 @@ Creates a list with n elements, + + + +-list(size_type n, const T& t) ++list(size_type n, const T& t) + + + Sequence +@@ -409,7 +409,7 @@ Creates a list with n copies of + + + +-list(const list&) ++list(const list&) + + + Container +@@ -422,7 +422,7 @@ The copy constructor. + + + template <class InputIterator> +-list(InputIterator f, InputIterator l) ++list(InputIterator f, InputIterator l) + [2] + + +@@ -435,7 +435,7 @@ Creates a list with a copy of a range. + + + +-~list() ++~list() + + + Container +@@ -446,7 +446,7 @@ The destructor. + + + +-list& operator=(const list&) ++list& operator=(const list&) + + + Container +@@ -457,7 +457,7 @@ The assignment operator + + + +-reference front() ++reference front() + + + Front Insertion Sequence +@@ -468,7 +468,7 @@ Returns the first element. + + + +-const_reference front() const ++const_reference front() const + + + Front Insertion Sequence +@@ -479,7 +479,7 @@ Returns the first element. + + + +-reference back() ++reference back() + + + Sequence +@@ -490,7 +490,7 @@ Returns the last element. + + + +-const_reference back() const ++const_reference back() const + + + Back Insertion Sequence +@@ -501,7 +501,7 @@ Returns the last element. + + + +-void push_front(const T&) ++void push_front(const T&) + + + Front Insertion Sequence +@@ -512,7 +512,7 @@ Inserts a new element at the beginning. + + + +-void push_back(const T&) ++void push_back(const T&) + + + Back Insertion Sequence +@@ -523,7 +523,7 @@ Inserts a new element at the end. + + + +-void pop_front() ++void pop_front() + + + Front Insertion Sequence +@@ -534,7 +534,7 @@ Removes the first element. + + + +-void pop_back() ++void pop_back() + + + Back Insertion Sequence +@@ -545,7 +545,7 @@ Removes the last element. + + + +-void swap(list&) ++void swap(list&) + + + Container +@@ -556,7 +556,7 @@ Swaps the contents of two lists. + + + +-iterator insert(iterator pos, const T& x) ++iterator insert(iterator pos, const T& x) + + + Sequence +@@ -569,7 +569,7 @@ Inserts x before pos. + + + template <class InputIterator> +-void insert(iterator pos, ++void insert(iterator pos, + InputIterator f, + InputIterator l) + [2] +@@ -585,7 +585,7 @@ Inserts the range [f, l) before + + + +-void insert(iterator pos, ++void insert(iterator pos, + size_type n, const T& x) + + +@@ -598,7 +598,7 @@ Inserts n copies of x + + + +-iterator erase(iterator pos) ++iterator erase(iterator pos) + + + Sequence +@@ -609,7 +609,7 @@ Erases the element at position pos + + +-iterator erase(iterator first, iterator last) ++iterator erase(iterator first, iterator last) + + + Sequence +@@ -620,7 +620,7 @@ Erases the range [first, last) + + + +-void clear() ++void clear() + + + Sequence +@@ -631,7 +631,7 @@ Erases all of the elements. + + + +-void resize(n, t = T()) ++void resize(n, t = T()) + + + Sequence +@@ -642,7 +642,7 @@ Inserts or erases elements at the end su + + + +-void splice(iterator pos, list& L) ++void splice(iterator pos, list& L) + + + list +@@ -654,7 +654,7 @@ See below. + + + +-void splice(iterator pos, ++void splice(iterator pos, + list& L, + iterator i) + +@@ -669,7 +669,7 @@ See below. + + + +-void splice(iterator pos, ++void splice(iterator pos, + list& L, + iterator f, iterator l) + +@@ -683,7 +683,7 @@ See below. + + + +-void remove(const T& value) ++void remove(const T& value) + + + list +@@ -694,7 +694,7 @@ See below. + + + +-void unique() ++void unique() + + + list +@@ -705,7 +705,7 @@ See below. + + + +-void merge(list& L) ++void merge(list& L) + + + list +@@ -716,7 +716,7 @@ See below. + + + +-void sort() ++void sort() + + + list +@@ -728,7 +728,7 @@ See below. + + + +-bool operator==(const list&, ++bool operator==(const list&, + const list&) + + +@@ -743,7 +743,7 @@ Tests two lists for equality. This is a + + + +-bool operator<(const list&, ++bool operator<(const list&, + const list&) + + +@@ -774,7 +774,7 @@ Description + + + +-void splice(iterator position, ++void splice(iterator position, + list<T, Alloc>& x); + + +@@ -790,7 +790,7 @@ void splice(iterator position, + + + +-void splice(iterator position, ++void splice(iterator position, + list<T, Alloc>& x, + iterator i); + +@@ -807,7 +807,7 @@ void splice(iterator position, + + + +-void splice(iterator position, ++void splice(iterator position, + list<T, Alloc>& x, + iterator f, iterator l); + +@@ -823,7 +823,7 @@ void splice(iterator position, + + + +-void remove(const T& val); ++void remove(const T& val); + + + Removes all elements that compare equal to val. The relative order +@@ -836,7 +836,7 @@ Removes all elements that compare equal + + + template<class Predicate> +-void remove_if(Predicate p); ++void remove_if(Predicate p); + [4] + + +@@ -849,7 +849,7 @@ Removes all elements *i such th + + + +-void unique(); ++void unique(); + + + Removes all but the first element in every consecutive group of +@@ -863,7 +863,7 @@ Removes all but the first element in eve + + + template<class BinaryPredicate> +-void unique(BinaryPredicate p); ++void unique(BinaryPredicate p); + [4] + + +@@ -879,7 +879,7 @@ Removes all but the first element in eve + + + +-void merge(list<T, Alloc>& x); ++void merge(list<T, Alloc>& x); + + + Both *this and x must be sorted according to operator<, and +@@ -897,7 +897,7 @@ Both *this and x must + + + template<class BinaryPredicate> +-void merge(list<T, Alloc>& x, ++void merge(list<T, Alloc>& x, + BinaryPredicate Comp); + [4] + +@@ -919,7 +919,7 @@ void merge(list<T, Alloc>& x, + + + +-void reverse(); ++void reverse(); + + + Reverses the order of elements in the list. All iterators remain +@@ -929,7 +929,7 @@ Reverses the order of elements in the li + + + +-void sort(); ++void sort(); + + + Sorts *this according to operator<. The sort is stable, that is, +@@ -944,7 +944,7 @@ Sorts *this according to op + + + template<class BinaryPredicate> +-void sort(BinaryPredicate comp); ++void sort(BinaryPredicate comp); + [4] + + +--- stl-manual-3.30.orig/priority_queue.html ++++ stl-manual-3.30/priority_queue.html +@@ -210,7 +210,7 @@ See below. + + + +-priority_queue() ++priority_queue() + + + Default Constructible +@@ -222,7 +222,7 @@ The default constructor. Creates an emp + + + +-priority_queue(const priority_queue&) ++priority_queue(const priority_queue&) + + + Assignable +@@ -233,7 +233,7 @@ The copy constructor. + + + +-priority_queue(const Compare&) ++priority_queue(const Compare&) + + + priority_queue +@@ -245,7 +245,7 @@ See below. + + + +-priority_queue(const value_type*, ++priority_queue(const value_type*, + const value_type*) + + +@@ -259,7 +259,7 @@ See below. + + + +-priority_queue(const value_type*, ++priority_queue(const value_type*, + const value_type*, + const Compare&) + +@@ -275,7 +275,7 @@ See below. + + + priority_queue& +-operator=(const priority_queue&) ++operator=(const priority_queue&) + + + +@@ -287,7 +287,7 @@ The assignment operator. + + + +-bool empty() const ++bool empty() const + + + priority_queue +@@ -298,7 +298,7 @@ See below. + + + +-size_type size() const ++size_type size() const + + + priority_queue +@@ -309,7 +309,7 @@ See below. + + + +-const value_type& top() const ++const value_type& top() const + + + priority_queue +@@ -320,7 +320,7 @@ See below. + + + +-void push(const value_type&) ++void push(const value_type&) + + + priority_queue +@@ -331,7 +331,7 @@ See below. + + + +-void pop() [3] ++void pop() [3] + + + priority_queue +@@ -374,7 +374,7 @@ An unsigned integral type. This is the + + + +-priority_queue(const Compare& comp) ++priority_queue(const Compare& comp) + + + The constructor. Creates an empty priority_queue, using comp +@@ -385,7 +385,7 @@ The constructor. Creates an empty p + + + +-priority_queue(const value_type* first, ++priority_queue(const value_type* first, + const value_type* last) + + +@@ -398,7 +398,7 @@ The constructor. Creates a priority + + + +-priority_queue(const value_type* first, ++priority_queue(const value_type* first, + const value_type* last, + const Compare& comp) + +@@ -411,7 +411,7 @@ The constructor. Creates a priority + + + +-bool empty() const ++bool empty() const + + + Returns true if the priority_queue contains no elements, and false +@@ -420,7 +420,7 @@ Returns true if the priorit + + + +-size_type size() const ++size_type size() const + + + Returns the number of elements contained in the priority_queue. +@@ -428,7 +428,7 @@ Returns the number of elements contained + + + +-const value_type& top() const ++const value_type& top() const + + + Returns a const reference to the element at the top of the priority_queue. +@@ -441,7 +441,7 @@ Returns a const reference to the element + + + +-void push(const value_type& x) ++void push(const value_type& x) + + + Inserts x into the priority_queue. Postcondition: size() will +@@ -450,7 +450,7 @@ Inserts x into the priority_que + + + +-void pop() ++void pop() + + + Removes the element at the top of the priority_queue, that is, the +--- stl-manual-3.30.orig/greater.html ++++ stl-manual-3.30/greater.html +@@ -142,7 +142,7 @@ The type of the result: bool + + + +-greater() ++greater() + + + DefaultConstructible +@@ -153,7 +153,7 @@ The default constructor. + + + +-bool operator()(const T& x, const T& y) ++bool operator()(const T& x, const T& y) + + + Binary Function +--- stl-manual-3.30.orig/hash.html ++++ stl-manual-3.30/hash.html +@@ -149,7 +149,7 @@ Description + + + +-size_t operator()(const T& x) ++size_t operator()(const T& x) + + + Hash Function +--- stl-manual-3.30.orig/Deque.html ++++ stl-manual-3.30/Deque.html +@@ -246,7 +246,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() ++iterator begin() + + + Container +@@ -257,7 +257,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -268,7 +268,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -279,7 +279,7 @@ Returns a const_iterator pointi + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -290,7 +290,7 @@ Returns a const_iterator pointi + + + +-reverse_iterator rbegin() ++reverse_iterator rbegin() + + + Reversible Container +@@ -302,7 +302,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() ++reverse_iterator rend() + + + Reversible Container +@@ -314,7 +314,7 @@ Returns a reverse_iterator poin + + + +-const_reverse_iterator rbegin() const ++const_reverse_iterator rbegin() const + + + Reversible Container +@@ -326,7 +326,7 @@ Returns a const_reverse_iterator + + +-const_reverse_iterator rend() const ++const_reverse_iterator rend() const + + + Reversible Container +@@ -338,7 +338,7 @@ Returns a const_reverse_iterator + + +-size_type size() const ++size_type size() const + + + Container +@@ -349,7 +349,7 @@ Returns the size of the deque. + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -360,7 +360,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -371,7 +371,7 @@ Returns the largest possible size of the + + + +-reference operator[](size_type n) ++reference operator[](size_type n) + + + Random Access Container +@@ -382,7 +382,7 @@ Returns the n'th element. + + + +-const_reference operator[](size_type n) const ++const_reference operator[](size_type n) const + + + Random Access Container +@@ -393,7 +393,7 @@ Returns the n'th element. + + + +-deque() ++deque() + + + Container +@@ -404,7 +404,7 @@ Creates an empty deque. + + + +-deque(size_type n) ++deque(size_type n) + + + Sequence +@@ -415,7 +415,7 @@ Creates a deque with n elements + + + +-deque(size_type n, const T& t) ++deque(size_type n, const T& t) + + + Sequence +@@ -426,7 +426,7 @@ Creates a deque with n copies o + + + +-deque(const deque&) ++deque(const deque&) + + + Container +@@ -439,7 +439,7 @@ The copy constructor. + + + template <class InputIterator> +-deque(InputIterator f, InputIterator l) ++deque(InputIterator f, InputIterator l) + [4] + + +@@ -452,7 +452,7 @@ Creates a deque with a copy of a range. + + + +-~deque() ++~deque() + + + Container +@@ -463,7 +463,7 @@ The destructor. + + + +-deque& operator=(const deque&) ++deque& operator=(const deque&) + + + Container +@@ -474,7 +474,7 @@ The assignment operator + + + +-reference front() ++reference front() + + + Front Insertion Sequence +@@ -485,7 +485,7 @@ Returns the first element. + + + +-const_reference front() const ++const_reference front() const + + + Front Insertion Sequence +@@ -496,7 +496,7 @@ Returns the first element. + + + +-reference back() ++reference back() + + + Back Insertion Sequence +@@ -507,7 +507,7 @@ Returns the last element. + + + +-const_reference back() const ++const_reference back() const + + + Back Insertion Sequence +@@ -518,7 +518,7 @@ Returns the last element. + + + +-void push_front(const T&) ++void push_front(const T&) + + + Front Insertion Sequence +@@ -529,7 +529,7 @@ Inserts a new element at the beginning. + + + +-void push_back(const T&) ++void push_back(const T&) + + + Back Insertion Sequence +@@ -540,7 +540,7 @@ Inserts a new element at the end. + + + +-void pop_front() ++void pop_front() + + + Front Insertion Sequence +@@ -551,7 +551,7 @@ Removes the first element. + + + +-void pop_back() ++void pop_back() + + + Back Insertion Sequence +@@ -562,7 +562,7 @@ Removes the last element. + + + +-void swap(deque&) ++void swap(deque&) + + + Container +@@ -574,7 +574,7 @@ Swaps the contents of two deques. + + + +-iterator insert(iterator pos, ++iterator insert(iterator pos, + const T& x) + + +@@ -589,7 +589,7 @@ Inserts x before pos. + + + template <class InputIterator> +-void insert(iterator pos, ++void insert(iterator pos, + InputIterator f, InputIterator l) + [4] + +@@ -604,7 +604,7 @@ Inserts the range [f, l) before + + + +-void insert(iterator pos, ++void insert(iterator pos, + size_type n, const T& x) + + +@@ -617,7 +617,7 @@ Inserts n copies of x + + + +-iterator erase(iterator pos) ++iterator erase(iterator pos) + + + Sequence +@@ -628,7 +628,7 @@ Erases the element at position pos + + +-iterator erase(iterator first, iterator last) ++iterator erase(iterator first, iterator last) + + + Sequence +@@ -639,7 +639,7 @@ Erases the range [first, last) + + + +-void clear() ++void clear() + + + Sequence +@@ -650,7 +650,7 @@ Erases all of the elements. + + + +-void resize(n, t = T()) ++void resize(n, t = T()) + + + Sequence +@@ -662,7 +662,7 @@ Inserts or erases elements at the end su + + + +-bool operator==(const deque&, ++bool operator==(const deque&, + const deque&) + + +@@ -677,7 +677,7 @@ Tests two deques for equality. This is + + + +-bool operator<(const deque&, ++bool operator<(const deque&, + const deque&) + + +--- stl-manual-3.30.orig/greater_equal.html ++++ stl-manual-3.30/greater_equal.html +@@ -144,7 +144,7 @@ The type of the result: bool + + + +-greater_equal() ++greater_equal() + + + DefaultConstructible +@@ -155,7 +155,7 @@ The default constructor. + + + +-bool operator()(const T& x, const T& y) ++bool operator()(const T& x, const T& y) + + + Binary Function +--- stl-manual-3.30.orig/mem_fun_t.html ++++ stl-manual-3.30/mem_fun_t.html +@@ -191,7 +191,7 @@ The type of the result: Result + + + +-Result operator()(X* x) const ++Result operator()(X* x) const + + + +@@ -205,7 +205,7 @@ Function call operator. Invokes x-& + + + +-explicit mem_fun_t(Result (X::*f)()) ++explicit mem_fun_t(Result (X::*f)()) + + + +@@ -220,7 +220,7 @@ See below. + + template <class Result, class X> + mem_fun_t<Result, X> +-mem_fun(Result (X::*f)()); ++mem_fun(Result (X::*f)()); + + + +@@ -248,7 +248,7 @@ Description + + + +-explicit mem_fun_t(Result (X::*f)()) ++explicit mem_fun_t(Result (X::*f)()) + + + +@@ -261,7 +261,7 @@ The constructor. Creates a mem_fun_ + + template <class Result, class X> + mem_fun_t<Result, X> +-mem_fun(Result (X::*f)()); ++mem_fun(Result (X::*f)()); + + + +--- stl-manual-3.30.orig/istream_iterator.html ++++ stl-manual-3.30/istream_iterator.html +@@ -127,7 +127,7 @@ Description + + + +-istream_iterator() ++istream_iterator() + + + istream_iterator +@@ -138,7 +138,7 @@ See below. + + + +-istream_iterator(istream&) ++istream_iterator(istream&) + + + istream_iterator +@@ -149,7 +149,7 @@ See below. + + + +-istream_iterator(const istream_iterator&) ++istream_iterator(const istream_iterator&) + + + Trivial Iterator +@@ -160,7 +160,7 @@ The copy constructor + + + +-istream_iterator& operator=(const istream_iterator&) ++istream_iterator& operator=(const istream_iterator&) + + + Trivial Iterator +@@ -171,7 +171,7 @@ The assignment operator + + + +-const T& operator*() const ++constT& operator*() const + + + Input Iterator +@@ -182,7 +182,7 @@ Returns the next object in the stream. + + + +-istream_iterator& operator++() ++istream_iterator& operator++() + + + Input Iterator +@@ -193,7 +193,7 @@ Preincrement. + + + +-istream_iterator& operator++(int) ++istream_iterator& operator++(int) + + + Input Iterator +@@ -204,7 +204,7 @@ Postincrement. + + + +-bool operator==(const istream_iterator&, const istream_iterator&) ++bool operator==(const istream_iterator&, const istream_iterator&) + + + Trivial iterator +@@ -215,7 +215,7 @@ The equality operator. This is a global + + + +-input_iterator_tag iterator_category(const istream_iterator&) ++input_iterator_tag iterator_category(const istream_iterator&) + + + iterator tags +@@ -226,7 +226,7 @@ Returns the iterator's category. + + + +-T* value_type(const istream_iterator&) ++T* value_type(const istream_iterator&) + + + iterator tags +@@ -237,7 +237,7 @@ Returns the iterator's value type. + + + +-Distance* distance_type(const istream_iterator&) ++Distance* distance_type(const istream_iterator&) + + + iterator tags +@@ -263,7 +263,7 @@ Description + + + +-istream_iterator() ++istream_iterator() + + + The default constructor: Constructs an end-of-stream iterator. +@@ -273,7 +273,7 @@ The default constructor: Constructs an + + + +-istream_iterator(istream& s) ++istream_iterator(istream& s) + + + Creates an istream_iterator that reads values from the input +--- stl-manual-3.30.orig/binder1st.html ++++ stl-manual-3.30/binder1st.html +@@ -147,7 +147,7 @@ The type of the result: AdaptableBin + + + +-result_type operator()(const argument_type& x) const ++result_type operator()(const argument_type& x) const + + + +@@ -161,7 +161,7 @@ arguments with which this binder1st< + + + +-binder1st(const AdaptableBinaryFunction& F, ++binder1st(const AdaptableBinaryFunction& F, + AdaptableBinaryFunction::first_argument_type c) + + +@@ -177,7 +177,7 @@ See below + + template <class AdaptableBinaryFunction, class T> + binder1st<AdaptableBinaryFunction> +-bind1st(const AdaptableBinaryFunction& F, const T& c); ++bind1st(const AdaptableBinaryFunction& F, const T& c); + + + +@@ -205,7 +205,7 @@ Description + + + +-binder1st(const AdaptableBinaryFunction& F, ++binder1st(const AdaptableBinaryFunction& F, + AdaptableBinaryFunction::first_argument_type c) + + +@@ -221,7 +221,7 @@ call F(c, x). + + template <class AdaptableBinaryFunction, class T> + binder1st<AdaptableBinaryFunction> +-bind1st(const AdaptableBinaryFunction& F, const T& c); ++bind1st(const AdaptableBinaryFunction& F, const T& c); + + + +--- stl-manual-3.30.orig/logical_and.html ++++ stl-manual-3.30/logical_and.html +@@ -148,7 +148,7 @@ The type of the result: bool + + + +-bool operator()(const T& x, const T& y) const ++bool operator()(const T& x, const T& y) const + + + Binary Function +@@ -159,7 +159,7 @@ Function call operator. The return valu + + + +-logical_and() ++logical_and() + + + Default Constructible +--- stl-manual-3.30.orig/binary_negate.html ++++ stl-manual-3.30/binary_negate.html +@@ -159,7 +159,7 @@ The type of the result: bool + + + +-binary_negate(const AdaptableBinaryPredicate& pred) ++binary_negate(const AdaptableBinaryPredicate& pred) + + + +@@ -174,7 +174,7 @@ See below. + + template <class AdaptableBinaryPredicate> + binary_negate<AdaptableBinaryPredicate> +-not2(const AdaptableBinaryPredicate& pred); ++not2(const AdaptableBinaryPredicate& pred); + + + +@@ -202,7 +202,7 @@ Description + + + +-binary_negate(const AdaptableBinaryPredicate& pred) ++binary_negate(const AdaptableBinaryPredicate& pred) + + + +@@ -215,7 +215,7 @@ whose underlying predicate is pred + template <class AdaptableBinaryPredicate> + binary_negate<AdaptableBinaryPredicate> +-not2(const AdaptableBinaryPredicate& pred); ++not2(const AdaptableBinaryPredicate& pred); + + + +--- stl-manual-3.30.orig/mem_fun1_t.html ++++ stl-manual-3.30/mem_fun1_t.html +@@ -224,7 +224,7 @@ The type of the result: Result + + + +-Result operator()(X* x, Arg a) const ++Result operator()(X* x, Arg a) const + + + +@@ -238,7 +238,7 @@ Function call operator. Invokes x-& + + + +-explicit mem_fun1_t(Result (X::*f)(Arg)) ++explicit mem_fun1_t(Result (X::*f)(Arg)) + + + +@@ -253,7 +253,7 @@ See below. + + template <class Result, class X, class Arg> + mem_fun1_t<Result, X, Arg> +-mem_fun(Result (X::*f)(Arg)); [2] ++mem_fun(Result (X::*f)(Arg)); [2] + + + +@@ -281,7 +281,7 @@ Description + + + +-explicit mem_fun1_t(Result (X::*f)(Arg)) ++explicit mem_fun1_t(Result (X::*f)(Arg)) + + + +@@ -294,7 +294,7 @@ The constructor. Creates a mem_fun1 + + template <class Result, class X, class Arg> + mem_fun1_t<Result, X, Arg> +-mem_fun(Result (X::*f)(Arg)); [2] ++mem_fun(Result (X::*f)(Arg)); [2] + + + +--- stl-manual-3.30.orig/pointer_to_unary_function.html ++++ stl-manual-3.30/pointer_to_unary_function.html +@@ -177,7 +177,7 @@ The type of the result: Result + + + +-result_type operator()(argument_type x) ++result_type operator()(argument_type x) + + + Unary Function +@@ -188,7 +188,7 @@ Function call operator. + + + +-pointer_to_unary_function(Result (*f)(Arg)) ++pointer_to_unary_function(Result (*f)(Arg)) + + + pointer_to_unary_function +@@ -199,7 +199,7 @@ See below. + + + +-pointer_to_unary_function() ++pointer_to_unary_function() + + + pointer_to_unary_function +@@ -213,7 +213,7 @@ See below. + + template <class Arg, class Result> + pointer_to_unary_function<Arg, Result> +-ptr_fun(Result (*x)(Arg)); ++ptr_fun(Result (*x)(Arg)); + + + +@@ -240,7 +240,7 @@ Description + + + +-pointer_to_unary_function(Result (*f)(Arg)) ++pointer_to_unary_function(Result (*f)(Arg)) + + + The constructor. Creates a pointer_to_unary_function whose underlying +@@ -249,7 +249,7 @@ The constructor. Creates a pointer_ + + + +-pointer_to_unary_function() ++pointer_to_unary_function() + + + The default constructor. This creates a pointer_to_unary_function +@@ -262,13 +262,13 @@ The default constructor. This creates a + + template <class Arg, class Result> + pointer_to_unary_function<Arg, Result> +-ptr_fun(Result (*x)(Arg)); ++ptr_fun(Result (*x)(Arg)); + + + + If f is of type Result (*)(Arg) then +-ptr_fun(f) is equivalent to +-pointer_to_unary_function<Arg,Result>(f), ++ptr_fun(f) is equivalent to ++pointer_to_unary_function<Arg,Result>(f), + but more convenient. This is a global function, not a member. + + +--- stl-manual-3.30.orig/multiset.html ++++ stl-manual-3.30/multiset.html +@@ -347,7 +347,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() const ++iterator begin() const + + + Container +@@ -358,7 +358,7 @@ Returns an iterator pointing to + + + +-iterator end() const ++iterator end() const + + + Container +@@ -369,7 +369,7 @@ Returns an iterator pointing to + + + +-reverse_iterator rbegin() const ++reverse_iterator rbegin() const + + + Reversible Container +@@ -381,7 +381,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() const ++reverse_iterator rend() const + + + Reversible Container +@@ -393,7 +393,7 @@ Returns a reverse_iterator poin + + + +-size_type size() const ++size_type size() const + + + Container +@@ -404,7 +404,7 @@ Returns the size of the multiset + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -415,7 +415,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -426,7 +426,7 @@ Returns the largest possible size of the + + + +-key_compare key_comp() const ++key_compare key_comp() const + + + Sorted Associative Container +@@ -437,7 +437,7 @@ Returns the key_compare object + + + +-value_compare value_comp() const ++value_compare value_comp() const + + + Sorted Associative Container +@@ -448,7 +448,7 @@ Returns the value_compare objec + + + +-multiset() ++multiset() + + + Container +@@ -459,7 +459,7 @@ Creates an empty multiset. + + + +-multiset(const key_compare& comp) ++multiset(const key_compare& comp) + + + Sorted Associative Container +@@ -472,7 +472,7 @@ Creates an empty multiset, usin + + + template <class InputIterator> +-multiset(InputIterator f, InputIterator l) ++multiset(InputIterator f, InputIterator l) + [1] + + +@@ -487,7 +487,7 @@ Creates a multiset with a copy of a rang + + + template <class InputIterator> +-multiset(InputIterator f, InputIterator l, ++multiset(InputIterator f, InputIterator l, + const key_compare& comp) + [1] + +@@ -502,7 +502,7 @@ Creates a multiset with a copy of a rang + + + +-multiset(const multiset&) ++multiset(const multiset&) + + + Container +@@ -513,7 +513,7 @@ The copy constructor. + + + +-multiset& operator=(const multiset&) ++multiset& operator=(const multiset&) + + + Container +@@ -524,7 +524,7 @@ The assignment operator + + + +-void swap(multiset&) ++void swap(multiset&) + + + Container +@@ -535,7 +535,7 @@ Swaps the contents of two multisets. + + + +-iterator insert(const value_type& x) ++iterator insert(const value_type& x) + + + Multiple Associative Container +@@ -547,7 +547,7 @@ Inserts x into the multiset + + + +-iterator insert(iterator pos, ++iterator insert(iterator pos, + const value_type& x) + + +@@ -563,7 +563,7 @@ Inserts x into the multiset + + + template <class InputIterator> +-void insert(InputIterator, InputIterator) ++void insert(InputIterator, InputIterator) + [1] + + +@@ -576,7 +576,7 @@ Inserts a range into the multiset + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Associative Container +@@ -587,7 +587,7 @@ Erases the element pointed to by pos + + + +-size_type erase(const key_type& k) ++size_type erase(const key_type& k) + + + Associative Container +@@ -598,7 +598,7 @@ Erases the element whose key is k + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Associative Container +@@ -609,7 +609,7 @@ Erases all elements in a range. + + + +-void clear() ++void clear() + + + Associative Container +@@ -620,7 +620,7 @@ Erases all of the elements. + + + +-iterator find(const key_type& k) const ++iterator find(const key_type& k) const + + + Associative Container +@@ -631,7 +631,7 @@ Finds an element whose key is k + + + +-size_type count(const key_type& k) const ++size_type count(const key_type& k) const + + + Associative Container +@@ -642,7 +642,7 @@ Counts the number of elements whose key + + + +-iterator lower_bound(const key_type& k) const ++iterator lower_bound(const key_type& k) const + + + Sorted Associative Container +@@ -653,7 +653,7 @@ Finds the first element whose key is not + + + +-iterator upper_bound(const key_type& k) const ++iterator upper_bound(const key_type& k) const + + + Sorted Associative Container +@@ -666,7 +666,7 @@ Finds the first element whose key greate + + + pair<iterator, iterator> +-equal_range(const key_type& k) const ++equal_range(const key_type& k) const + + + +@@ -679,7 +679,7 @@ Finds a range containing all elements wh + + + +-bool operator==(const multiset&, ++bool operator==(const multiset&, + const multiset&) + + +@@ -694,7 +694,7 @@ Tests two multisets for equality. This + + + +-bool operator<(const multiset&, ++bool operator<(const multiset&, + const multiset&) + + +--- stl-manual-3.30.orig/pointer_to_binary_function.html ++++ stl-manual-3.30/pointer_to_binary_function.html +@@ -197,7 +197,7 @@ The type of the result: Result + + + +-Result operator()(Arg1 x, Arg2 y) ++Result operator()(Arg1 x, Arg2 y) + + + Binary Function +@@ -208,7 +208,7 @@ Function call operator. + + + +-pointer_to_binary_function(Result (*f)(Arg1, Arg2)) ++pointer_to_binary_function(Result (*f)(Arg1, Arg2)) + + + pointer_to_binary_function +@@ -219,7 +219,7 @@ See below. + + + +-pointer_to_binary_function() ++pointer_to_binary_function() + + + pointer_to_binary_function +@@ -233,7 +233,7 @@ See below. + + template <class Arg1, class Arg2, class Result> + pointer_to_unary_function<Arg1, Arg2, Result> +-ptr_fun(Result (*x)(Arg1, Arg2)); ++ptr_fun(Result (*x)(Arg1, Arg2)); + + + +@@ -260,7 +260,7 @@ Description + + + +-pointer_to_binary_function(Result (*f)(Arg1, Arg2)) ++pointer_to_binary_function(Result (*f)(Arg1, Arg2)) + + + The constructor. Creates a pointer_to_binary_function whose underlying +@@ -269,7 +269,7 @@ The constructor. Creates a pointer_ + + + +-pointer_to_binary_function() ++pointer_to_binary_function() + + + The default constructor. This creates a pointer_to_binary_function +@@ -282,13 +282,13 @@ The default constructor. This creates a + + template <class Arg1, class Arg2, class Result> + pointer_to_unary_function<Arg1, Arg2, Result> +-ptr_fun(Result (*x)(Arg1, Arg2)); ++ptr_fun(Result (*x)(Arg1, Arg2)); + + + + If f is of type Result (*)(Arg1, Arg2) then +-ptr_fun(f) is equivalent to +-pointer_to_binary_function<Arg1,Arg2,Result>(f), ++ptr_fun(f) is equivalent to ++pointer_to_binary_function<Arg1,Arg2,Result>(f), + but more convenient. This is a global function, not a member + function. + +--- stl-manual-3.30.orig/hash_multimap.html ++++ stl-manual-3.30/hash_multimap.html +@@ -343,7 +343,7 @@ Const iterator used to iterate through a + + + +-iterator begin() ++iterator begin() + + + Container +@@ -354,7 +354,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -365,7 +365,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -376,7 +376,7 @@ Returns an const_iterator point + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -387,7 +387,7 @@ Returns an const_iterator point + + + +-size_type size() const ++size_type size() const + + + Container +@@ -398,7 +398,7 @@ Returns the size of the hash_multima + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -409,7 +409,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -420,7 +420,7 @@ Returns the largest possible size of the + + + +-size_type bucket_count() const ++size_type bucket_count() const + + + Hashed Associative Container +@@ -431,7 +431,7 @@ Returns the number of buckets used by th + + + +-void resize(size_type n) ++void resize(size_type n) + + + Hashed Associative Container +@@ -442,7 +442,7 @@ Increases the bucket count to at least < + + + +-hasher hash_funct() const ++hasher hash_funct() const + + + Hashed Associative Container +@@ -453,7 +453,7 @@ Returns the hasher object used + + + +-key_equal key_eq() const ++key_equal key_eq() const + + + Hashed Associative Container +@@ -464,7 +464,7 @@ Returns the key_equal object us + + + +-hash_multimap() ++hash_multimap() + + + Container +@@ -475,7 +475,7 @@ Creates an empty hash_multimap. + + + +-hash_multimap(size_type n) ++hash_multimap(size_type n) + + + Hashed Associative Container +@@ -487,7 +487,7 @@ Creates an empty hash_multimap + + + +-hash_multimap(size_type n, ++hash_multimap(size_type n, + const hasher& h) + + +@@ -502,7 +502,7 @@ Creates an empty hash_multimap + + + +-hash_multimap(size_type n, ++hash_multimap(size_type n, + const hasher& h, + const key_equal& k) + +@@ -519,7 +519,7 @@ Creates an empty hash_multimap + + + template <class InputIterator> +-hash_multimap(InputIterator, InputIterator) ++hash_multimap(InputIterator, InputIterator) + [2] + + +@@ -534,7 +534,7 @@ Creates a hash_multimap with a copy of a + + + template <class InputIterator> +-hash_multimap(InputIterator, InputIterator, ++hash_multimap(InputIterator, InputIterator, + size_type n) + [2] + +@@ -551,7 +551,7 @@ Creates a hash_multimap with a copy of a + + + template <class InputIterator> +-hash_multimap(InputIterator, InputIterator, ++hash_multimap(InputIterator, InputIterator, + size_type n, const hasher& h) + [2] + +@@ -568,7 +568,7 @@ Creates a hash_multimap with a copy of a + + + template <class InputIterator> +-hash_multimap(InputIterator, InputIterator, ++hash_multimap(InputIterator, InputIterator, + size_type n, const hasher& h, + const key_equal& k) + [2] +@@ -585,7 +585,7 @@ Creates a hash_multimap with a copy of a + + + +-hash_multimap(const hash_multimap&) ++hash_multimap(const hash_multimap&) + + + Container +@@ -596,7 +596,7 @@ The copy constructor. + + + +-hash_multimap& operator=(const hash_multimap&) ++hash_multimap& operator=(const hash_multimap&) + + + Container +@@ -607,7 +607,7 @@ The assignment operator + + + +-void swap(hash_multimap&) ++void swap(hash_multimap&) + + + Container +@@ -618,7 +618,7 @@ Swaps the contents of two hash_multimaps + + + +-iterator insert(const value_type& x) ++iterator insert(const value_type& x) + + + Multiple Associative Container +@@ -631,7 +631,7 @@ Inserts x into the hash_mul + + + template <class InputIterator> +-void insert(InputIterator, InputIterator) ++void insert(InputIterator, InputIterator) + [2] + + +@@ -644,7 +644,7 @@ Inserts a range into the hash_multim + + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Associative Container +@@ -655,7 +655,7 @@ Erases the element pointed to by pos + + + +-size_type erase(const key_type& k) ++size_type erase(const key_type& k) + + + Associative Container +@@ -666,7 +666,7 @@ Erases the element whose key is k + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Associative Container +@@ -677,7 +677,7 @@ Erases all elements in a range. + + + +-void clear() ++void clear() + + + Associative Container +@@ -688,7 +688,7 @@ Erases all of the elements. + + + +-const_iterator find(const key_type& k) const ++const_iterator find(const key_type& k) const + + + Associative Container +@@ -699,7 +699,7 @@ Finds an element whose key is k + + + +-iterator find(const key_type& k) ++iterator find(const key_type& k) + + + Associative Container +@@ -710,7 +710,7 @@ Finds an element whose key is k + + + +-size_type count(const key_type& k) const ++size_type count(const key_type& k) const + + + Associative Container +@@ -723,7 +723,7 @@ Counts the number of elements whose key + + + pair<const_iterator, const_iterator> +-equal_range(const key_type& k) const ++equal_range(const key_type& k) const + + + +@@ -737,7 +737,7 @@ Finds a range containing all elements wh + + + pair<iterator, iterator> +-equal_range(const key_type& k) ++equal_range(const key_type& k) + + + +@@ -750,7 +750,7 @@ Finds a range containing all elements wh + + + +-bool operator==(const hash_multimap&, ++bool operator==(const hash_multimap&, + const hash_multimap&) + + +--- stl-manual-3.30.orig/bit_vector.html ++++ stl-manual-3.30/bit_vector.html +@@ -204,7 +204,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() ++iterator begin() + + + Container +@@ -215,7 +215,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -226,7 +226,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -237,7 +237,7 @@ Returns a const_iterator pointi + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -248,7 +248,7 @@ Returns a const_iterator pointi + + + +-reverse_iterator rbegin() ++reverse_iterator rbegin() + + + Reversible Container +@@ -260,7 +260,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() ++reverse_iterator rend() + + + Reversible Container +@@ -272,7 +272,7 @@ Returns a reverse_iterator poin + + + +-const_reverse_iterator rbegin() const ++const_reverse_iterator rbegin() const + + + Reversible Container +@@ -284,7 +284,7 @@ Returns a const_reverse_iterator + + +-const_reverse_iterator rend() const ++const_reverse_iterator rend() const + + + Reversible Container +@@ -296,7 +296,7 @@ Returns a const_reverse_iterator + + +-size_type size() const ++size_type size() const + + + Container +@@ -307,7 +307,7 @@ Returns the number of elements in the + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -318,7 +318,7 @@ Returns the largest possible size of the + + + +-size_type capacity() const ++size_type capacity() const + + + bit_vector +@@ -329,7 +329,7 @@ See below. + + + +-bool empty() const ++bool empty() const + + + Container +@@ -340,7 +340,7 @@ See below. + + + +-reference operator[](size_type n) ++reference operator[](size_type n) + + + Random Access Container +@@ -351,7 +351,7 @@ Returns the n'th element. + + + +-const_reference operator[](size_type n) const ++const_reference operator[](size_type n) const + + + Random Access Container +@@ -362,7 +362,7 @@ Returns the n'th element. + + + +-bit_vector() ++bit_vector() + + + Container +@@ -373,7 +373,7 @@ Creates an empty bit_vector. + + + +-bit_vector(size_type n) ++bit_vector(size_type n) + + + Sequence +@@ -384,7 +384,7 @@ Creates a bit_vector with n ele + + + +-bit_vector(size_type n, bool t) ++bit_vector(size_type n, bool t) + + + Sequence +@@ -395,7 +395,7 @@ Creates a bit_vector with n cop + + + +-bit_vector(const bit_vector&) ++bit_vector(const bit_vector&) + + + Container +@@ -408,7 +408,7 @@ The copy constructor. + + + template <class InputIterator> +-bit_vector(InputIterator, InputIterator) ++bit_vector(InputIterator, InputIterator) + [1] + + +@@ -421,7 +421,7 @@ Creates a bit_vector with a copy of a ra + + + +-~bit_vector() ++~bit_vector() + + + Container +@@ -432,7 +432,7 @@ The destructor. + + + +-bit_vector& operator=(const bit_vector&) ++bit_vector& operator=(const bit_vector&) + + + Container +@@ -443,7 +443,7 @@ The assignment operator + + + +-void reserve(size_t) ++void reserve(size_t) + + + bit_vector +@@ -454,7 +454,7 @@ See below. + + + +-reference front() ++reference front() + + + Sequence +@@ -465,7 +465,7 @@ Returns the first element. + + + +-const_reference front() const ++const_reference front() const + + + Sequence +@@ -476,7 +476,7 @@ Returns the first element. + + + +-reference back() ++reference back() + + + Back Insertion Sequence +@@ -487,7 +487,7 @@ Returns the last element. + + + +-const_reference back() const ++const_reference back() const + + + Back Insertion Sequence +@@ -498,7 +498,7 @@ Returns the last element. + + + +-void push_back(const T&) ++void push_back(const T&) + + + Back Insertion Sequence +@@ -509,7 +509,7 @@ Inserts a new element at the end. + + + +-void pop_back() ++void pop_back() + + + Back Insertion Sequence +@@ -520,7 +520,7 @@ Removes the last element. + + + +-void swap(bit_vector&) ++void swap(bit_vector&) + + + Container +@@ -532,7 +532,7 @@ Swaps the contents of two bit_vectors. + + + +-void swap(bit_vector::reference x, ++void swap(bit_vector::reference x, + bit_vector::reference y) + + +@@ -545,7 +545,7 @@ See below. + + + +-iterator insert(iterator pos, bool x) ++iterator insert(iterator pos, bool x) + + + Sequence +@@ -558,7 +558,7 @@ Inserts x before pos. + + + template <class InputIterator> +-void insert(iterator pos, ++void insert(iterator pos, + InputIterator f, InputIterator l) + [1] + +@@ -573,7 +573,7 @@ Inserts the range [f, l) before + + + +-void insert(iterator pos, ++void insert(iterator pos, + size_type n, bool x) + + +@@ -586,7 +586,7 @@ Inserts n copies of x + + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Sequence +@@ -597,7 +597,7 @@ Erases the element at position pos + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Sequence +@@ -608,7 +608,7 @@ Erases the range [first, last) + + + +-void clear() ++void clear() + + + Sequence +@@ -620,7 +620,7 @@ Erases all of the elements. + + + +-bool operator==(const bit_vector&, ++bool operator==(const bit_vector&, + const bit_vector&) + + +@@ -635,7 +635,7 @@ Tests two bit_vectors for equality. Thi + + + +-bool operator<(const bit_vector&, ++bool operator<(const bit_vector&, + const bit_vector&) + + +@@ -680,7 +680,7 @@ A proxy class that acts as a reference t + + + +-size_type capacity() const ++size_type capacity() const + + + Number of bits for which memory has been allocated. +@@ -690,7 +690,7 @@ Number of bits for which memory has been + + + +-void reserve(size_type n) ++void reserve(size_type n) + + + If n is less than or equal to capacity(), this call has no effect. +@@ -703,7 +703,7 @@ If n is less than or equal to < + + + +-void swap(bit_vector::reference x, ++void swap(bit_vector::reference x, + bit_vector::reference y) + + +--- stl-manual-3.30.orig/project2nd.html ++++ stl-manual-3.30/project2nd.html +@@ -159,7 +159,7 @@ The type of the result: Arg2. + + + +-Arg1 operator()(const Arg1&, const Arg2& y) const ++Arg1 operator()(const Arg1&, const Arg2& y) const + + + Adaptable Binary Function +--- stl-manual-3.30.orig/ReverseIterator.html ++++ stl-manual-3.30/ReverseIterator.html +@@ -193,7 +193,7 @@ See below + + + +-reverse_iterator() ++reverse_iterator() + + + Trivial Iterator +@@ -204,7 +204,7 @@ The default constructor + + + +-reverse_iterator(const reverse_iterator& x) ++reverse_iterator(const reverse_iterator& x) + + + Trivial Iterator +@@ -215,7 +215,7 @@ The copy constructor + + + +-reverse_iterator& operator=(const reverse_iterator& x) ++reverse_iterator& operator=(const reverse_iterator& x) + + + Trivial Iterator +@@ -226,7 +226,7 @@ The assignment operator + + + +-reverse_iterator(RandomAccessIterator x) ++reverse_iterator(RandomAccessIterator x) + + + reverse_iterator +@@ -237,7 +237,7 @@ See below. + + + +-RandomAccessIterator base() ++RandomAccessIterator base() + + + reverse_iterator +@@ -248,7 +248,7 @@ See below. + + + +-Reference operator*() const ++Reference operator*() const + + + Trivial Iterator +@@ -259,7 +259,7 @@ The dereference operator + + + +-reverse_iterator& operator++() ++reverse_iterator& operator++() + + + Forward Iterator +@@ -270,7 +270,7 @@ Preincrement + + + +-reverse_iterator operator++(int) ++reverse_iterator operator++(int) + + + Forward Iterator +@@ -281,7 +281,7 @@ Postincrement + + + +-reverse_iterator& operator--() ++reverse_iterator& operator--() + + + Bidirectional Iterator +@@ -292,7 +292,7 @@ Predecrement + + + +-reverse_iterator operator--(int) ++reverse_iterator operator--(int) + + + Bidirectional Iterator +@@ -303,7 +303,7 @@ Postdecrement + + + +-reverse_iterator operator+(Distance) ++reverse_iterator operator+(Distance) + + + Random Access Iterator +@@ -314,7 +314,7 @@ Iterator addition + + + +-reverse_iterator& operator+=(Distance) ++reverse_iterator& operator+=(Distance) + + + Random Access Iterator +@@ -325,7 +325,7 @@ Iterator addition + + + +-reverse_iterator operator-(Distance) ++reverse_iterator operator-(Distance) + + + Random Access Iterator +@@ -336,7 +336,7 @@ Iterator subtraction + + + +-reverse_iterator& operator-=(Distance) ++reverse_iterator& operator-=(Distance) + + + Random Access Iterator +@@ -347,7 +347,7 @@ Iterator subtraction + + + +-Reference operator[](Distance) ++Reference operator[](Distance) + + + Random Access Iterator +@@ -358,7 +358,7 @@ Random access to an element. + + + +-reverse_iterator operator+(Distance, reverse_iterator) ++reverse_iterator operator+(Distance, reverse_iterator) + + + Random Access Iterator +@@ -369,7 +369,7 @@ Iterator addition. This is a global fun + + + +-Distance operator-(const reverse_iterator&, const reverse_iterator&) ++Distance operator-(const reverse_iterator&, const reverse_iterator&) + + + Random Access Iterator +@@ -381,7 +381,7 @@ Finds the distance between two iterators + + + +-bool operator==(const reverse_iterator&, const reverse_iterator&) ++bool operator==(const reverse_iterator&, const reverse_iterator&) + + + Trivial Iterator +@@ -393,7 +393,7 @@ Compares two iterators for equality. + + + +-bool operator<(const reverse_iterator&, const reverse_iterator&) ++bool operator<(const reverse_iterator&, const reverse_iterator&) + + + Random Access Iterator +@@ -405,7 +405,7 @@ Determines whether the first argument pr + + + +-random_access_iterator_tag iterator_category(const reverse_iterator&) ++random_access_iterator_tag iterator_category(const reverse_iterator&) + + + Iterator tags +@@ -417,7 +417,7 @@ Returns the iterator's category. + + + +-T* value_type(const reverse_iterator&) ++T* value_type(const reverse_iterator&) + + + Iterator tags +@@ -429,7 +429,7 @@ Returns the iterator's value type. + + + +-Distance* distance_type(const reverse_iterator&) ++Distance* distance_type(const reverse_iterator&) + + + Iterator tags +@@ -464,7 +464,7 @@ A typedef for reverse_iterator< + + +-RandomAccessIterator base() ++RandomAccessIterator base() + + + Returns the current value of the reverse_iterator's base iterator. +@@ -476,7 +476,7 @@ Returns the current value of the rev + + + +-reverse_iterator(RandomAccessIterator i) ++reverse_iterator(RandomAccessIterator i) + + + Constructs a reverse_iterator whose base iterator is i. +--- stl-manual-3.30.orig/pair.html ++++ stl-manual-3.30/pair.html +@@ -150,7 +150,7 @@ See below. + + + +-pair() ++pair() + + + pair +@@ -161,7 +161,7 @@ The default constructor. See below. + + + +-pair(const first_type&, const second_type&) ++pair(const first_type&, const second_type&) + + + pair +@@ -172,7 +172,7 @@ The pair constructor. See below. + + + +-pair(const pair&) ++pair(const pair&) + + + Assignable +@@ -183,7 +183,7 @@ The copy constructor + + + +-pair& operator=(const pair&) ++pair& operator=(const pair&) + + + Assignable +@@ -216,7 +216,7 @@ See below. + + + +-bool operator==(const pair&, const pair&) ++bool operator==(const pair&, const pair&) + + + pair +@@ -227,7 +227,7 @@ See below. + + + +-bool operator<(const pair&, const pair&) ++bool operator<(const pair&, const pair&) + + + pair +@@ -240,7 +240,7 @@ See below. + + + template <class T1, class T2> +-pair<T1, T2> make_pair(const T1&, const T2&) ++pair<T1,T2> make_pair(const T1&, const T2&) + + + +@@ -284,7 +284,7 @@ The type of the pair's second component. + + + +-pair() ++pair() + + + The default constructor. It uses constructs objects of types +@@ -294,7 +294,7 @@ The default constructor. It uses constr + + + +-pair(const first_type& x, const second_type& y) ++pair(const first_type& x, const second_type& y) + + + The pair constructor. Constructs a pair such that first is constructed +@@ -321,7 +321,7 @@ Public member variable of type secon + + + template <class T1, class T2> +-bool operator==(const pair<T1,T2>& x, ++bool operator==(const pair<T1,T2>& x, + const pair<T1,T2>& y); + + +@@ -337,7 +337,7 @@ This is a global function, not a member + + + template <class T1, class T2> +-bool operator<(const pair<T1,T2>& x, ++bool operator<(const pair<T1,T2>& x, + const pair<T1,T2>& y); + + +@@ -357,7 +357,7 @@ This is a global function, not a member + + + template <class T1, class T2> +-pair<T1, T2> make_pair(const T1& x, const T2& x) ++pair<T1,T2> make_pair(const T1& x, const T2& x) + + + +--- stl-manual-3.30.orig/logical_or.html ++++ stl-manual-3.30/logical_or.html +@@ -147,7 +147,7 @@ The type of the result: bool + + + +-bool operator()(const T& x, const T& y) const ++bool operator()(const T& x, const T& y) const + + + Binary Function +@@ -158,7 +158,7 @@ Function call operator. The return valu + + + +-logical_or() ++logical_or() + + + Default Constructible +--- stl-manual-3.30.orig/temporary_buffer.html ++++ stl-manual-3.30/temporary_buffer.html +@@ -162,7 +162,7 @@ Description + + + +-temporary_buffer(ForwardIterator first, ++temporary_buffer(ForwardIterator first, + ForwardIterator last) + + +@@ -175,7 +175,7 @@ valid range. + + + +-~temporary_buffer() ++~temporary_buffer() + + + Destroys the elements in the temporary buffer, and deallocates +@@ -184,7 +184,7 @@ the buffer itself. + + + +-T* begin() ++T* begin() + + + Returns a pointer to the first element in the buffer. +@@ -192,7 +192,7 @@ Returns a pointer to the first element i + + + +-T* end() ++T* end() + + + Returns a pointer that points one past the last element +@@ -201,7 +201,7 @@ in the buffer. + + + +-ptrdiff_t requested_size() const ++ptrdiff_t requested_size() const + + + Returns the value last - first, where first and last are +@@ -210,12 +210,12 @@ the arguments that were passed to the co + + + +-ptrdiff_t size() const ++ptrdiff_t size() const + + + Returns the number of elements in the temporary buffer, +-end() - begin(). The return value satisfies the constraint +-0 <= size() <= requested_size(). ++end()- begin(). The return value satisfies the constraint ++0<= size() <= requested_size(). + + + +--- stl-manual-3.30.orig/select1st.html ++++ stl-manual-3.30/select1st.html +@@ -140,7 +140,7 @@ The type of the result: Pair::first_ + + + const Pair::first_type& +-operator()(const Pair& p) const ++operator()(const Pair& p) const + + + +--- stl-manual-3.30.orig/insert_iterator.html ++++ stl-manual-3.30/insert_iterator.html +@@ -185,7 +185,7 @@ Description + + + +-insert_iterator(Container&, Container::iterator) ++insert_iterator(Container&, Container::iterator) + + + insert_iterator +@@ -196,7 +196,7 @@ See below. + + + +-insert_iterator(const insert_iterator&) ++insert_iterator(const insert_iterator&) + + + Trivial Iterator +@@ -207,7 +207,7 @@ The copy constructor + + + +-insert_iterator& operator=(const insert_iterator&) ++insert_iterator& operator=(const insert_iterator&) + + + Trivial Iterator +@@ -218,7 +218,7 @@ The assignment operator + + + +-insert_iterator& operator*() ++insert_iterator& operator*() + + + Output Iterator +@@ -229,7 +229,7 @@ Used to implement the Output Iterator +@@ -240,7 +240,7 @@ Used to implement the Output Iterator +@@ -251,7 +251,7 @@ Preincrement. + + + +-insert_iterator& operator++(int) ++insert_iterator& operator++(int) + + + Output Iterator +@@ -262,7 +262,7 @@ Postincrement. + + + +-output_iterator_tag iterator_category(const insert_iterator&) ++output_iterator_tag iterator_category(const insert_iterator&) + + + iterator tags +@@ -277,7 +277,7 @@ Returns the iterator's category. + + template<class Container, class Iter) + insert_iterator<Container> +-inserter(Container& C, Iter i); ++inserter(Container& C, Iter i); + + + +@@ -303,7 +303,7 @@ Description + + + +-insert_iterator(Container& C, Container::iterator i) ++insert_iterator(Container& C, Container::iterator i) + + + Constructs an insert_iterator that inserts objects in C. +@@ -320,11 +320,11 @@ Constructs an insert_iterator t + + template<class Container, class Iter) + insert_iterator<Container> +-inserter(Container& C, Iter i); ++inserter(Container& C, Iter i); + + + +-Equivalent to insert_iterator<Container>(C, i). [2] ++Equivalentto insert_iterator<Container>(C, i). [2] + This is a global function, not a member function. + + +--- stl-manual-3.30.orig/mem_fun1_ref_t.html ++++ stl-manual-3.30/mem_fun1_ref_t.html +@@ -216,7 +216,7 @@ The type of the result: Result + + + +-Result operator()(X& x, Arg a) const ++Result operator()(X& x, Arg a) const + + + +@@ -230,7 +230,7 @@ Function call operator. Invokes x.f + + + +-explicit mem_fun1_ref_t(Result (X::*f)(Arg)) ++explicit mem_fun1_ref_t(Result (X::*f)(Arg)) + + + +@@ -245,7 +245,7 @@ See below. + + template <class Result, class X, class Arg> + mem_fun1_ref_t<Result, X, Arg> +-mem_fun_ref(Result (X::*f)(Arg)); [2] ++mem_fun_ref(Result (X::*f)(Arg)); [2] + + + +@@ -273,7 +273,7 @@ Description + + + +-explicit mem_fun1_ref_t(Result (X::*f)(Arg)) ++explicit mem_fun1_ref_t(Result (X::*f)(Arg)) + + + +@@ -286,7 +286,7 @@ The constructor. Creates a mem_fun1 + + template <class Result, class X, class Arg> + mem_fun1_ref_t<Result, X, Arg> +-mem_fun1_ref(Result (X::*f)(Arg)); [2] ++mem_fun1_ref(Result (X::*f)(Arg)); [2] + + + +--- stl-manual-3.30.orig/hash_set.html ++++ stl-manual-3.30/hash_set.html +@@ -311,13 +311,13 @@ Iterator used to iterate through a h + Container + + +-Const iterator used to iterate through a hash_set. (Iterator and ++Const iterator used to iterate through a hash_set. (Iterator and + const_iterator are the same type.) + + + + +-iterator begin() const ++iterator begin() const + + + Container +@@ -328,7 +328,7 @@ Returns an iterator pointing to + + + +-iterator end() const ++iterator end() const + + + Container +@@ -339,7 +339,7 @@ Returns an iterator pointing to + + + +-size_type size() const ++size_type size() const + + + Container +@@ -350,7 +350,7 @@ Returns the size of the hash_set + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -361,7 +361,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -372,7 +372,7 @@ Returns the largest possible size of the + + + +-size_type bucket_count() const ++size_type bucket_count() const + + + Hashed Associative Container +@@ -383,7 +383,7 @@ Returns the number of buckets used by th + + + +-void resize(size_type n) ++void resize(size_type n) + + + Hashed Associative Container +@@ -394,7 +394,7 @@ Increases the bucket count to at least < + + + +-hasher hash_funct() const ++hasher hash_funct() const + + + Hashed Associative Container +@@ -405,7 +405,7 @@ Returns the hasher object used + + + +-key_equal key_eq() const ++key_equal key_eq() const + + + Hashed Associative Container +@@ -416,7 +416,7 @@ Returns the key_equal object us + + + +-hash_set() ++hash_set() + + + Container +@@ -427,7 +427,7 @@ Creates an empty hash_set. + + + +-hash_set(size_type n) ++hash_set(size_type n) + + + Hashed Associative Container +@@ -439,7 +439,7 @@ Creates an empty hash_set with + + + +-hash_set(size_type n, ++hash_set(size_type n, + const hasher& h) + + +@@ -454,7 +454,7 @@ Creates an empty hash_set with + + + +-hash_set(size_type n, ++hash_set(size_type n, + const hasher& h, + const key_equal& k) + +@@ -471,7 +471,7 @@ Creates an empty hash_set with + + + template <class InputIterator> +-hash_set(InputIterator f, InputIterator l) ++hash_set(InputIterator f, InputIterator l) + [1] + + +@@ -486,7 +486,7 @@ Creates a hash_set with a copy of a rang + + + template <class InputIterator> +-hash_set(InputIterator f, InputIterator l, ++hash_set(InputIterator f, InputIterator l, + size_type n) + [1] + +@@ -503,7 +503,7 @@ Creates a hash_set with a copy of a rang + + + template <class InputIterator> +-hash_set(InputIterator f, InputIterator l, ++hash_set(InputIterator f, InputIterator l, + size_type n, const hasher& h) + [1] + +@@ -519,7 +519,7 @@ Creates a hash_set with a copy of a rang + + + +-hash_set(InputIterator f, InputIterator l, ++hash_set(InputIterator f, InputIterator l, + size_type n, const hasher& h, + const key_equal& k) + [1] +@@ -536,7 +536,7 @@ Creates a hash_set with a copy of a rang + + + +-hash_set(const hash_set&) ++hash_set(const hash_set&) + + + Container +@@ -547,7 +547,7 @@ The copy constructor. + + + +-hash_set& operator=(const hash_set&) ++hash_set& operator=(const hash_set&) + + + Container +@@ -558,7 +558,7 @@ The assignment operator + + + +-void swap(hash_set&) ++void swap(hash_set&) + + + Container +@@ -571,7 +571,7 @@ Swaps the contents of two hash_sets. + + + pair<iterator, bool> +-insert(const value_type& x) ++insert(const value_type& x) + + + +@@ -585,7 +585,7 @@ Inserts x into the hash_set + + + template <class InputIterator> +-void insert(InputIterator f, InputIterator l) ++void insert(InputIterator f, InputIterator l) + [1] + + +@@ -598,7 +598,7 @@ Inserts a range into the hash_set + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Associative Container +@@ -609,7 +609,7 @@ Erases the element pointed to by pos + + + +-size_type erase(const key_type& k) ++size_type erase(const key_type& k) + + + Associative Container +@@ -620,7 +620,7 @@ Erases the element whose key is k + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Associative Container +@@ -631,7 +631,7 @@ Erases all elements in a range. + + + +-void clear() ++void clear() + + + Associative Container +@@ -642,7 +642,7 @@ Erases all of the elements. + + + +-iterator find(const key_type& k) const ++iterator find(const key_type& k) const + + + Associative Container +@@ -653,7 +653,7 @@ Finds an element whose key is k + + + +-size_type count(const key_type& k) const ++size_type count(const key_type& k) const + + + Unique Associative Container +@@ -666,7 +666,7 @@ Counts the number of elements whose key + + + pair<iterator, iterator> +-equal_range(const key_type& k) const ++equal_range(const key_type& k) const + + + +@@ -679,7 +679,7 @@ Finds a range containing all elements wh + + + +-bool operator==(const hash_set&, ++bool operator==(const hash_set&, + const hash_set&) + + +--- stl-manual-3.30.orig/subtractive_rng.html ++++ stl-manual-3.30/subtractive_rng.html +@@ -114,7 +114,7 @@ The type of the result: unsigned int + + + +-subtractive_rng(unsigned int seed) ++subtractive_rng(unsigned int seed) + + + subtractive_rng +@@ -125,7 +125,7 @@ See below. + + + +-subtractive_rng() ++subtractive_rng() + + + subtractive_rng +@@ -136,7 +136,7 @@ See below. + + + +-unsigned int operator()(unsigned int N) ++unsignedint operator()(unsigned int N) + + + Adaptable Unary Function +@@ -148,7 +148,7 @@ Function call. Returns a pseudo-random + + + +-void initialize(unsigned int seed) ++void initialize(unsigned int seed) + + + subtractive_rng +@@ -174,7 +174,7 @@ Description + + + +-subtractive_rng(unsigned int seed) ++subtractive_rng(unsigned int seed) + + + The constructor. Creates a subtractive_rng whose internal state +@@ -183,7 +183,7 @@ The constructor. Creates a subtract + + + +-subtractive_rng() ++subtractive_rng() + + + The default constructor. Creates a subtractive_rng initialized +@@ -192,7 +192,7 @@ The default constructor. Creates a + + + +-void initialize(unsigned int seed) ++void initialize(unsigned int seed) + + + Re-initializes the internal state of the subtractive_rng, using +--- stl-manual-3.30.orig/less.html ++++ stl-manual-3.30/less.html +@@ -144,7 +144,7 @@ The type of the result: bool + + + +-less() ++less() + + + DefaultConstructible +@@ -155,7 +155,7 @@ The default constructor. + + + +-bool operator()(const T& x, const T& y) ++bool operator()(const T& x, const T& y) + + + Binary Function +--- stl-manual-3.30.orig/modulus.html ++++ stl-manual-3.30/modulus.html +@@ -151,7 +151,7 @@ The type of the result: T + + + +-T operator()(const T& x, const T& y) ++T operator()(const T& x, const T& y) + + + Adaptable Binary Function +@@ -162,7 +162,7 @@ Function call operator. The return valu + + + +-modulus() ++modulus() + + + Default Constructible +--- stl-manual-3.30.orig/queue.html ++++ stl-manual-3.30/queue.html +@@ -185,7 +185,7 @@ See below. + + + +-queue() ++queue() + + + Default Constructible +@@ -196,7 +196,7 @@ The default constructor. Creates an emp + + + +-queue(const queue&) ++queue(const queue&) + + + Assignable +@@ -207,7 +207,7 @@ The copy constructor. + + + +-queue& operator=(const queue&) ++queue& operator=(const queue&) + + + Assignable +@@ -218,7 +218,7 @@ The assignment operator. + + + +-bool empty() const ++bool empty() const + + + queue +@@ -229,7 +229,7 @@ See below. + + + +-size_type size() const ++size_type size() const + + + queue +@@ -240,7 +240,7 @@ See below. + + + +-value_type& front() ++value_type& front() + + + queue +@@ -251,7 +251,7 @@ See below. + + + +-const value_type& front() const ++const value_type& front() const + + + queue +@@ -262,7 +262,7 @@ See below. + + + +-value_type& back() ++value_type& back() + + + queue +@@ -273,7 +273,7 @@ See below. + + + +-const value_type& back() const ++const value_type& back() const + + + queue +@@ -284,7 +284,7 @@ See below. + + + +-void push(const value_type&) ++void push(const value_type&) + + + queue +@@ -295,7 +295,7 @@ See below. + + + +-void pop() [3] ++void pop() [3] + + + queue +@@ -306,7 +306,7 @@ See below. + + + +-bool operator==(const queue&, const queue&) ++bool operator==(const queue&, const queue&) + + + queue +@@ -317,7 +317,7 @@ See below. + + + +-bool operator<(const queue&, const queue&) ++bool operator<(const queue&, const queue&) + + + queue +@@ -360,7 +360,7 @@ An unsigned integral type. This is the + + + +-bool empty() const ++bool empty() const + + + Returns true if the queue contains no elements, and false +@@ -369,7 +369,7 @@ Returns true if the queue + + +-size_type size() const ++size_type size() const + + + Returns the number of elements contained in the queue. +@@ -377,7 +377,7 @@ Returns the number of elements contained + + + +-value_type& front() ++value_type& front() + + + Returns a mutable reference to the element at the front of the +@@ -387,7 +387,7 @@ Returns a mutable reference to the eleme + + + +-const value_type& front() const ++const value_type& front() const + + + Returns a const reference to the element at the front of the +@@ -397,7 +397,7 @@ Returns a const reference to the element + + + +-value_type& back() ++value_type& back() + + + Returns a mutable reference to the element at the back of the +@@ -407,7 +407,7 @@ Returns a mutable reference to the eleme + + + +-const value_type& back() const ++const value_type& back() const + + + Returns a const reference to the element at the back of the +@@ -417,7 +417,7 @@ Returns a const reference to the element + + + +-void push(const value_type& x) ++void push(const value_type& x) + + + Inserts x at the back of the queue. Postconditions: size() will +@@ -426,7 +426,7 @@ Inserts x at the back of the qu + + + +-void pop() ++void pop() + + + Removes the element at the front of the queue. [3] Precondition: +@@ -436,7 +436,7 @@ Removes the element at the front of the + + + +-bool operator==(const queue&, const queue&) ++bool operator==(const queue&, const queue&) + + + Compares two queues for equality. Two queues are equal if they +@@ -446,7 +446,7 @@ Compares two queues for equality. Two q + + + +-bool operator<(const queue&, const queue&) ++bool operator<(const queue&, const queue&) + + + Lexicographical ordering of two queues. +--- stl-manual-3.30.orig/front_insert_iterator.html ++++ stl-manual-3.30/front_insert_iterator.html +@@ -117,7 +117,7 @@ Description + + + +-front_insert_iterator(FrontInsertionSequence&) ++front_insert_iterator(FrontInsertionSequence&) + + + front_insert_iterator +@@ -128,7 +128,7 @@ See below. + + + +-front_insert_iterator(const front_insert_iterator&) ++front_insert_iterator(const front_insert_iterator&) + + + Trivial Iterator +@@ -141,7 +141,7 @@ The copy constructor + + + front_insert_iterator& +-operator=(const front_insert_iterator&) ++operator=(const front_insert_iterator&) + + + +@@ -153,7 +153,7 @@ The assignment operator + + + +-front_insert_iterator& operator*() ++front_insert_iterator& operator*() + + + Output Iterator +@@ -166,7 +166,7 @@ Used to implement the + + +-front_insert_iterator& operator++() ++front_insert_iterator& operator++() + + + Output Iterator +@@ -189,7 +189,7 @@ Preincrement. + + + +-front_insert_iterator& operator++(int) ++front_insert_iterator& operator++(int) + + + Output Iterator +@@ -202,7 +202,7 @@ Postincrement. + + + output_iterator_tag +-iterator_category(const front_insert_iterator&) ++iterator_category(const front_insert_iterator&) + + + +@@ -218,7 +218,7 @@ Returns the iterator's category. + + template<class FrontInsertionSequence> + front_insert_iterator<FrontInsertionSequence> +-front_inserter(FrontInsertionSequence& S) ++front_inserter(FrontInsertionSequence& S) + + + +@@ -244,7 +244,7 @@ Description + + + +-front_insert_iterator(FrontInsertionSequence& S) ++front_insert_iterator(FrontInsertionSequence& S) + + + Constructs a front_insert_iterator that inserts objects +@@ -256,7 +256,7 @@ Constructs a front_insert_iterator + template<class FrontInsertionSequence> + front_insert_iterator<FrontInsertionSequence> +-front_inserter(FrontInsertionSequence& S); ++front_inserter(FrontInsertionSequence& S); + + + +--- stl-manual-3.30.orig/project1st.html ++++ stl-manual-3.30/project1st.html +@@ -159,7 +159,7 @@ The type of the result: Arg1. + + + +-Arg1 operator()(const Arg1& x, const Arg2&) const ++Arg1 operator()(const Arg1& x, const Arg2&) const + + + Adaptable Binary Function +--- stl-manual-3.30.orig/Vector.html ++++ stl-manual-3.30/Vector.html +@@ -234,7 +234,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() ++iterator begin() + + + Container +@@ -245,7 +245,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -256,7 +256,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -267,7 +267,7 @@ Returns a const_iterator pointi + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -278,7 +278,7 @@ Returns a const_iterator pointi + + + +-reverse_iterator rbegin() ++reverse_iterator rbegin() + + + Reversible Container +@@ -290,7 +290,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() ++reverse_iterator rend() + + + Reversible Container +@@ -302,7 +302,7 @@ Returns a reverse_iterator poin + + + +-const_reverse_iterator rbegin() const ++const_reverse_iterator rbegin() const + + + Reversible Container +@@ -314,7 +314,7 @@ Returns a const_reverse_iterator + + +-const_reverse_iterator rend() const ++const_reverse_iterator rend() const + + + Reversible Container +@@ -326,7 +326,7 @@ Returns a const_reverse_iterator + + +-size_type size() const ++size_type size() const + + + Container +@@ -337,7 +337,7 @@ Returns the size of the vector. + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -348,7 +348,7 @@ Returns the largest possible size of the + + + +-size_type capacity() const ++size_type capacity() const + + + vector +@@ -359,7 +359,7 @@ See below. + + + +-bool empty() const ++bool empty() const + + + Container +@@ -370,7 +370,7 @@ See below. + + + +-reference operator[](size_type n) ++reference operator[](size_type n) + + + Random Access Container +@@ -381,7 +381,7 @@ Returns the n'th element. + + + +-const_reference operator[](size_type n) const ++const_reference operator[](size_type n) const + + + Random Access Container +@@ -392,7 +392,7 @@ Returns the n'th element. + + + +-vector() ++vector() + + + Container +@@ -403,7 +403,7 @@ Creates an empty vector. + + + +-vector(size_type n) ++vector(size_type n) + + + Sequence +@@ -414,7 +414,7 @@ Creates a vector with n element + + + +-vector(size_type n, const T& t) ++vector(size_type n, const T& t) + + + Sequence +@@ -425,7 +425,7 @@ Creates a vector with n copies + + + +-vector(const vector&) ++vector(const vector&) + + + Container +@@ -438,7 +438,7 @@ The copy constructor. + + + template <class InputIterator> +-vector(InputIterator, InputIterator) ++vector(InputIterator, InputIterator) + [1] + + +@@ -451,7 +451,7 @@ Creates a vector with a copy of a range. + + + +-~vector() ++~vector() + + + Container +@@ -462,7 +462,7 @@ The destructor. + + + +-vector& operator=(const vector&) ++vector& operator=(const vector&) + + + Container +@@ -473,7 +473,7 @@ The assignment operator + + + +-void reserve(size_t) ++void reserve(size_t) + + + vector +@@ -484,7 +484,7 @@ See below. + + + +-reference front() ++reference front() + + + Sequence +@@ -495,7 +495,7 @@ Returns the first element. + + + +-const_reference front() const ++const_reference front() const + + + Sequence +@@ -506,7 +506,7 @@ Returns the first element. + + + +-reference back() ++reference back() + + + Back Insertion Sequence +@@ -517,7 +517,7 @@ Returns the last element. + + + +-const_reference back() const ++const_reference back() const + + + Back Insertion Sequence +@@ -528,7 +528,7 @@ Returns the last element. + + + +-void push_back(const T&) ++void push_back(const T&) + + + Back Insertion Sequence +@@ -539,7 +539,7 @@ Inserts a new element at the end. + + + +-void pop_back() ++void pop_back() + + + Back Insertion Sequence +@@ -550,7 +550,7 @@ Removes the last element. + + + +-void swap(vector&) ++void swap(vector&) + + + Container +@@ -562,7 +562,7 @@ Swaps the contents of two vectors. + + + +-iterator insert(iterator pos, ++iterator insert(iterator pos, + const T& x) + + +@@ -577,7 +577,7 @@ Inserts x before pos. + + + template <class InputIterator> +-void insert(iterator pos, ++void insert(iterator pos, + InputIterator f, InputIterator l) + [1] + +@@ -592,7 +592,7 @@ Inserts the range [first, last) + + + +-void insert(iterator pos, ++void insert(iterator pos, + size_type n, const T& x) + + +@@ -605,7 +605,7 @@ Inserts n copies of x + + + +-iterator erase(iterator pos) ++iterator erase(iterator pos) + + + Sequence +@@ -616,7 +616,7 @@ Erases the element at position pos + + +-iterator erase(iterator first, iterator last) ++iterator erase(iterator first, iterator last) + + + Sequence +@@ -627,7 +627,7 @@ Erases the range [first, last) + + + +-void clear() ++void clear() + + + Sequence +@@ -638,7 +638,7 @@ Erases all of the elements. + + + +-void resize(n, t = T()) ++void resize(n, t = T()) + + + Sequence +@@ -650,7 +650,7 @@ Inserts or erases elements at the end su + + + +-bool operator==(const vector&, ++bool operator==(const vector&, + const vector&) + + +@@ -665,7 +665,7 @@ Tests two vectors for equality. This is + + + +-bool operator<(const vector&, ++bool operator<(const vector&, + const vector&) + + +@@ -694,7 +694,7 @@ Description + + + +-size_type capacity() const ++size_type capacity() const + + + Number of elements for which memory has been allocated. +@@ -704,7 +704,7 @@ Number of elements for which memory has + + + +-void reserve(size_type n) ++void reserve(size_type n) + + + If n is less than or equal to capacity(), this call has no effect. +--- stl-manual-3.30.orig/unary_compose.html ++++ stl-manual-3.30/unary_compose.html +@@ -170,7 +170,7 @@ The type of the result: AdaptableUna + + + +-unary_compose(const AdaptableUnaryFunction1& f, ++unary_compose(const AdaptableUnaryFunction1& f, + const AdaptableUnaryFunction2& g); + + +@@ -186,7 +186,7 @@ See below. + + template <class AdaptableUnaryFunction1, class AdaptableUnaryFunction2> + unary_compose<AdaptableUnaryFunction1, AdaptableUnaryFunction2> +-compose1(const AdaptableUnaryFunction1& op1, ++compose1(const AdaptableUnaryFunction1& op1, + const AdaptableUnaryFunction2& op2); + + +@@ -215,7 +215,7 @@ Description + + + +-unary_compose(const AdaptableUnaryFunction1& f, ++unary_compose(const AdaptableUnaryFunction1& f, + const AdaptableUnaryFunction2& g); + + +@@ -229,15 +229,15 @@ the function object f o g. + template <class AdaptableUnaryFunction1, class AdaptableUnaryFunction2> + unary_compose<AdaptableUnaryFunction1, AdaptableUnaryFunction2> +-compose1(const AdaptableUnaryFunction1& op1, ++compose1(const AdaptableUnaryFunction1& op1, + const AdaptableUnaryFunction2& op2); + + + + Creates a unary_compose object. If f and g are, respectively, of classes + AdaptableUnaryFunction1 and AdaptableUnaryFunction2, then +-compose1(f, g) is equivalent to +-unary_compose<AdaptableUnaryFunction1, AdaptableUnaryFunction2>(f, g), ++compose1(f, g) is equivalent to ++unary_compose<AdaptableUnaryFunction1, AdaptableUnaryFunction2>(f, g), + but is more convenient. This is a global function, not a member function. + + +--- stl-manual-3.30.orig/Multimap.html ++++ stl-manual-3.30/Multimap.html +@@ -342,7 +342,7 @@ Const iterator used to iterate backwards + + + +-iterator begin() ++iterator begin() + + + Container +@@ -353,7 +353,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -364,7 +364,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -375,7 +375,7 @@ Returns a const_iterator pointi + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -386,7 +386,7 @@ Returns a const_iterator pointi + + + +-reverse_iterator rbegin() ++reverse_iterator rbegin() + + + Reversible Container +@@ -398,7 +398,7 @@ Returns a reverse_iterator poin + + + +-reverse_iterator rend() ++reverse_iterator rend() + + + Reversible Container +@@ -410,7 +410,7 @@ Returns a reverse_iterator poin + + + +-const_reverse_iterator rbegin() const ++const_reverse_iterator rbegin() const + + + Reversible Container +@@ -422,7 +422,7 @@ Returns a const_reverse_iterator + + +-const_reverse_iterator rend() const ++const_reverse_iterator rend() const + + + Reversible Container +@@ -434,7 +434,7 @@ Returns a const_reverse_iterator + + +-size_type size() const ++size_type size() const + + + Container +@@ -445,7 +445,7 @@ Returns the size of the multimap + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -456,7 +456,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -467,7 +467,7 @@ Returns the largest possible size of the + + + +-key_compare key_comp() const ++key_compare key_comp() const + + + Sorted Associative Container +@@ -478,7 +478,7 @@ Returns the key_compare object + + + +-value_compare value_comp() const ++value_compare value_comp() const + + + Sorted Associative Container +@@ -489,7 +489,7 @@ Returns the value_compare objec + + + +-multimap() ++multimap() + + + Container +@@ -500,7 +500,7 @@ Creates an empty multimap. + + + +-multimap(const key_compare& comp) ++multimap(const key_compare& comp) + + + Sorted Associative Container +@@ -513,7 +513,7 @@ Creates an empty multimap, usin + + + template <class InputIterator> +-multimap(InputIterator f, InputIterator l) ++multimap(InputIterator f, InputIterator l) + [2] + + +@@ -528,7 +528,7 @@ Creates a multimap with a copy of a rang + + + template <class InputIterator> +-multimap(InputIterator f, InputIterator l, ++multimap(InputIterator f, InputIterator l, + const key_compare& comp) + [2] + +@@ -543,7 +543,7 @@ Creates a multimap with a copy of a rang + + + +-multimap(const multimap&) ++multimap(const multimap&) + + + Container +@@ -554,7 +554,7 @@ The copy constructor. + + + +-multimap& operator=(const multimap&) ++multimap& operator=(const multimap&) + + + Container +@@ -565,7 +565,7 @@ The assignment operator + + + +-void swap(multimap&) ++void swap(multimap&) + + + Container +@@ -576,7 +576,7 @@ Swaps the contents of two multimaps. + + + +-iterator insert(const value_type& x) ++iterator insert(const value_type& x) + + + Multiple Associative Container +@@ -588,7 +588,7 @@ Inserts x into the multimap + + + +-iterator insert(iterator pos, ++iterator insert(iterator pos, + const value_type& x) + + +@@ -604,7 +604,7 @@ Inserts x into the multimap + + + template <class InputIterator> +-void insert(InputIterator, InputIterator) ++void insert(InputIterator, InputIterator) + [2] + + +@@ -617,7 +617,7 @@ Inserts a range into the multimap + + +-void erase(iterator pos) ++void erase(iterator pos) + + + Associative Container +@@ -628,7 +628,7 @@ Erases the element pointed to by pos + + + +-size_type erase(const key_type& k) ++size_type erase(const key_type& k) + + + Associative Container +@@ -639,7 +639,7 @@ Erases the element whose key is k + + +-void erase(iterator first, iterator last) ++void erase(iterator first, iterator last) + + + Associative Container +@@ -650,7 +650,7 @@ Erases all elements in a range. + + + +-void clear() ++void clear() + + + Associative Container +@@ -661,7 +661,7 @@ Erases all of the elements. + + + +-iterator find(const key_type& k) ++iterator find(const key_type& k) + + + Associative Container +@@ -672,7 +672,7 @@ Finds an element whose key is k + + + +-const_iterator find(const key_type& k) const ++const_iterator find(const key_type& k) const + + + Associative Container +@@ -683,7 +683,7 @@ Finds an element whose key is k + + + +-size_type count(const key_type& k) ++size_type count(const key_type& k) + + + Associative Container +@@ -694,7 +694,7 @@ Counts the number of elements whose key + + + +-iterator lower_bound(const key_type& k) ++iterator lower_bound(const key_type& k) + + + Sorted Associative Container +@@ -705,7 +705,7 @@ Finds the first element whose key is not + + + +-const_iterator lower_bound(const key_type& k) const ++const_iterator lower_bound(const key_type& k) const + + + Sorted Associative Container +@@ -716,7 +716,7 @@ Finds the first element whose key is not + + + +-iterator upper_bound(const key_type& k) ++iterator upper_bound(const key_type& k) + + + Sorted Associative Container +@@ -727,7 +727,7 @@ Finds the first element whose key greate + + + +-const_iterator upper_bound(const key_type& k) const ++const_iterator upper_bound(const key_type& k) const + + + Sorted Associative Container +@@ -740,7 +740,7 @@ Finds the first element whose key greate + + + pair<iterator, iterator> +-equal_range(const key_type& k) ++equal_range(const key_type& k) + + + +@@ -754,7 +754,7 @@ Finds a range containing all elements wh + + + pair<const_iterator, const_iterator> +-equal_range(const key_type& k) const ++equal_range(const key_type& k) const + + + +@@ -767,7 +767,7 @@ Finds a range containing all elements wh + + + +-bool operator==(const multimap&, ++bool operator==(const multimap&, + const multimap&) + + +@@ -782,7 +782,7 @@ Tests two multimaps for equality. This + + + +-bool operator<(const multimap&, ++bool operator<(const multimap&, + const multimap&) + + +--- stl-manual-3.30.orig/Slist.html ++++ stl-manual-3.30/Slist.html +@@ -257,7 +257,7 @@ Const iterator used to iterate through a + + + +-iterator begin() ++iterator begin() + + + Container +@@ -268,7 +268,7 @@ Returns an iterator pointing to + + + +-iterator end() ++iterator end() + + + Container +@@ -279,7 +279,7 @@ Returns an iterator pointing to + + + +-const_iterator begin() const ++const_iterator begin() const + + + Container +@@ -290,7 +290,7 @@ Returns a const_iterator pointi + + + +-const_iterator end() const ++const_iterator end() const + + + Container +@@ -301,7 +301,7 @@ Returns a const_iterator pointi + + + +-size_type size() const ++size_type size() const + + + Container +@@ -316,7 +316,7 @@ Returns the size of the slist. + + + +-size_type max_size() const ++size_type max_size() const + + + Container +@@ -327,7 +327,7 @@ Returns the largest possible size of the + + + +-bool empty() const ++bool empty() const + + + Container +@@ -338,7 +338,7 @@ Returns the largest possible size of the + + + +-slist() ++slist() + + + Container +@@ -349,7 +349,7 @@ Creates an empty slist. + + + +-slist(size_type n) ++slist(size_type n) + + + Sequence +@@ -360,7 +360,7 @@ Creates an slist with n + + +-slist(size_type n, const T& t) ++slist(size_type n, const T& t) + + + Sequence +@@ -371,7 +371,7 @@ Creates an slist with n copies + + + +-slist(const slist&) ++slist(const slist&) + + + Container +@@ -384,7 +384,7 @@ The copy constructor. + + + template <class InputIterator> +-slist(InputIterator f, InputIterator l) ++slist(InputIterator f, InputIterator l) + [3] + + +@@ -397,7 +397,7 @@ Creates an slist with a copy of + + + +-~slist() ++~slist() + + + Container +@@ -408,7 +408,7 @@ The destructor. + + + +-slist& operator=(const slist&) ++slist& operator=(const slist&) + + + Container +@@ -419,7 +419,7 @@ The assignment operator + + + +-void swap(slist&) ++void swap(slist&) + + + Container +@@ -430,7 +430,7 @@ Swaps the contents of two slists. + + + +-reference front() ++reference front() + + + Front Insertion Sequence +@@ -441,7 +441,7 @@ Returns the first element. + + + +-const_reference front() const ++const_reference front() const + + + Front Insertion Sequence +@@ -452,7 +452,7 @@ Returns the first element. + + + +-void push_front(const T&) ++void push_front(const T&) + + + Front Insertion Sequence +@@ -463,7 +463,7 @@ Inserts a new element at the beginning. + + + +-void pop_front() ++void pop_front() + + + Front Insertion Sequence +@@ -474,7 +474,7 @@ Removes the first element. + + + +-iterator previous(iterator pos) ++iterator previous(iterator pos) + + + slist +@@ -485,7 +485,7 @@ See below + + + +-const_iterator previous(const_iterator pos) ++const_iterator previous(const_iterator pos) + + + slist +@@ -496,7 +496,7 @@ See below + + + +-iterator insert(iterator pos, const T& x) ++iterator insert(iterator pos, const T& x) + + + Sequence +@@ -509,7 +509,7 @@ Inserts x before pos. + + + template<class InputIterator> +-void insert(iterator pos, InputIterator f, InputIterator l) ++void insert(iterator pos, InputIterator f, InputIterator l) + [3] + + +@@ -523,7 +523,7 @@ Inserts the range [first, last) + + + +-void insert(iterator pos, ++void insert(iterator pos, + size_type n, const value_type& x) + + +@@ -536,7 +536,7 @@ Inserts n copies of x + + + +-iterator erase(iterator pos) ++iterator erase(iterator pos) + + + Sequence +@@ -547,7 +547,7 @@ Erases the element at position pos + + +-iterator erase(iterator first, iterator last) ++iterator erase(iterator first, iterator last) + + + Sequence +@@ -558,7 +558,7 @@ Erases the range [first, last) + + + +-void clear() ++void clear() + + + Sequence +@@ -569,7 +569,7 @@ Erases all of the elements. + + + +-void resize(n, t = T()) ++void resize(n, t = T()) + + + Sequence +@@ -580,7 +580,7 @@ Inserts or erases elements at the end su + + + +-iterator insert_after(iterator pos) ++iterator insert_after(iterator pos) + + + slist +@@ -591,7 +591,7 @@ See below. + + + +-iterator insert_after(iterator pos, const value_type& x) ++iterator insert_after(iterator pos, const value_type& x) + + + slist +@@ -604,7 +604,7 @@ See below. + + + template<class InputIterator> +-void insert_after(iterator pos, ++void insert_after(iterator pos, + InputIterator f, InputIterator l) + + +@@ -618,7 +618,7 @@ See below. + + + +-void insert_after(iterator pos, ++void insert_after(iterator pos, + size_type n, const value_type& x) + + +@@ -631,7 +631,7 @@ See below. + + + +-iterator erase_after(iterator pos) ++iterator erase_after(iterator pos) + + + slist +@@ -642,7 +642,7 @@ See below. + + + +-iterator erase_after(iterator before_first, iterator last) ++iterator erase_after(iterator before_first, iterator last) + + + slist +@@ -653,7 +653,7 @@ See below. + + + +-void splice(iterator position, slist& L) ++void splice(iterator position, slist& L) + + + slist +@@ -664,7 +664,7 @@ See below. + + + +-void splice(iterator position, slist& L, iterator i) ++void splice(iterator position, slist& L, iterator i) + + + slist +@@ -675,7 +675,7 @@ See below. + + + +-void splice(iterator position, slist& L, iterator f, iterator l) ++void splice(iterator position, slist& L, iterator f, iterator l) + + + slist +@@ -686,7 +686,7 @@ See below. + + + +-void splice_after(iterator pos, iterator prev) ++void splice_after(iterator pos, iterator prev) + + + slist +@@ -698,7 +698,7 @@ See below. + + + +-void splice_after(iterator pos, ++void splice_after(iterator pos, + iterator before_first, + iterator before_last) + +@@ -712,7 +712,7 @@ See below. + + + +-void remove(const T& value) ++void remove(const T& value) + + + slist +@@ -723,7 +723,7 @@ See below. + + + +-void unique() ++void unique() + + + slist +@@ -734,7 +734,7 @@ See below. + + + +-void merge(slist& L) ++void merge(slist& L) + + + slist +@@ -745,7 +745,7 @@ See below. + + + +-void sort() ++void sort() + + + slist +@@ -757,7 +757,7 @@ See below. + + + +-bool operator==(const slist&, ++bool operator==(const slist&, + const slist&) + + +@@ -772,7 +772,7 @@ Tests two slists for equality. This is + + + +-bool operator<(const slist&, ++bool operator<(const slist&, + const slist&) + + +@@ -799,7 +799,7 @@ Description + + + +-iterator previous(iterator pos) ++iterator previous(iterator pos) + + + pos must be a valid iterator in *this. The return value is +@@ -809,7 +809,7 @@ Description + + + +-const_iterator previous(const_iterator pos) ++const_iterator previous(const_iterator pos) + + + pos must be a valid iterator in *this. The return value is +@@ -819,7 +819,7 @@ Description + + + +-iterator insert_after(iterator pos) ++iterator insert_after(iterator pos) + + + pos must be a dereferenceable iterator in *this. (That is, +@@ -831,7 +831,7 @@ Description + + + +-iterator insert_after(iterator pos, ++iterator insert_after(iterator pos, + const value_type& x) + + +@@ -846,7 +846,7 @@ iterator insert_after(iterator pos, + + + template<class InputIterator> +-void insert_after(iterator pos, ++void insert_after(iterator pos, + InputIterator f, InputIterator l) + + +@@ -858,7 +858,7 @@ Inserts elements from the range [f, + + + +-void insert_after(iterator pos, ++void insert_after(iterator pos, + size_type n, const value_type& x) + + +@@ -869,7 +869,7 @@ Inserts n copies of x + + + +-iterator erase_after(iterator pos) ++iterator erase_after(iterator pos) + + + Erases the element pointed to by the iterator following pos. +@@ -878,7 +878,7 @@ Erases the element pointed to by the ite + + + +-iterator erase_after(iterator before_first, iterator last) ++iterator erase_after(iterator before_first, iterator last) + + + Erases all elements in the range [before_first + 1, last). +@@ -888,7 +888,7 @@ Erases all elements in the range [be + + + +-void splice(iterator position, ++void splice(iterator position, + slist<T, Alloc>& x); + + +@@ -905,7 +905,7 @@ void splice(iterator position, + + + +-void splice(iterator position, ++void splice(iterator position, + slist<T, Alloc>& x, + iterator i); + +@@ -924,7 +924,7 @@ void splice(iterator position, + + + +-void splice(iterator position, ++void splice(iterator position, + slist<T, Alloc>& x, + iterator f, iterator l); + +@@ -942,7 +942,7 @@ void splice(iterator position, + + + +-void remove(const T& val); ++void remove(const T& val); + + + Removes all elements that compare equal to val. The relative order +@@ -953,7 +953,7 @@ Removes all elements that compare equal + + + +-void splice_after(iterator pos, iterator prev) ++void splice_after(iterator pos, iterator prev) + + + pos must be a dereferenceable iterator in *this, and prev +@@ -967,7 +967,7 @@ Removes all elements that compare equal + + + +-void splice_after(iterator pos, ++void splice_after(iterator pos, + iterator before_first, + iterator before_last) + +@@ -986,7 +986,7 @@ void splice_after(iterator pos, + + + template<class Predicate> +-void remove_if(Predicate p); ++void remove_if(Predicate p); + [5] + + +@@ -999,7 +999,7 @@ Removes all elements *i such th + + + +-void unique(); ++void unique(); + + + Removes all but the first element in every consecutive group of +@@ -1013,7 +1013,7 @@ Removes all but the first element in eve + + + template<class BinaryPredicate> +-void unique(BinaryPredicate p); ++void unique(BinaryPredicate p); + [5] + + +@@ -1029,7 +1029,7 @@ Removes all but the first element in eve + + + +-void merge(slist<T, Alloc>& x); ++void merge(slist<T, Alloc>& x); + + + Both *this and x must be sorted according to operator<, and +@@ -1047,7 +1047,7 @@ Both *this and x must + + + template<class BinaryPredicate> +-void merge(slist<T, Alloc>& x, ++void merge(slist<T, Alloc>& x, + BinaryPredicate Comp); + [5] + +@@ -1069,7 +1069,7 @@ void merge(slist<T, Alloc>& x, + + + +-void reverse(); ++void reverse(); + + + Reverses the order of elements in the slist. All iterators remain +@@ -1079,7 +1079,7 @@ Reverses the order of elements in the sl + + + +-void sort(); ++void sort(); + + + Sorts *this according to operator<. The sort is stable, that is, +@@ -1094,7 +1094,7 @@ Sorts *this according to op + + + template<class BinaryPredicate> +-void sort(BinaryPredicate comp); ++void sort(BinaryPredicate comp); + [5] + + diff -Nru stl-manual-3.30/debian/patches/series stl-manual-3.30/debian/patches/series --- stl-manual-3.30/debian/patches/series 2010-02-10 10:48:34.000000000 +0000 +++ stl-manual-3.30/debian/patches/series 2010-12-22 04:27:11.000000000 +0000 @@ -1 +1 @@ -debian-changes-3.30-11 +debian-changes-3.30-12