[git commit] include: fix indentation and spacing
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Tue Apr 17 07:00:00 UTC 2012
commit: http://git.uclibc.org/uClibc++/commit/?id=ed11a152ef4886cbd2093627f00943d37c6edee6
branch: http://git.uclibc.org/uClibc++/commit/?id=refs/heads/master
no obj-code changes
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
include/algorithm | 30 ++++++++--------
include/associative_base | 8 ++--
include/exception | 12 +++---
include/functional | 34 +++++++++---------
include/ios | 12 +++---
include/istream | 90 ++++++++++++++++++++++-----------------------
include/istream_helpers | 10 ++---
include/iterator | 20 +++++-----
include/iterator_base | 14 ++++----
include/list | 31 ++++++++--------
include/locale | 2 +-
include/set | 29 +++++++--------
include/string | 64 ++++++++++++++++----------------
include/support | 24 ++++++-------
include/vector | 20 +++++-----
15 files changed, 196 insertions(+), 204 deletions(-)
diff --git a/include/algorithm b/include/algorithm
index 285d8c5..5e8f139 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -120,14 +120,14 @@ namespace std{
}
++temp2;
}
-
+
}
return last1;
}
template<class ForwardIterator1, class ForwardIterator2, class BinaryPredicate> _UCXXEXPORT
ForwardIterator1
- find_first_of(ForwardIterator1 first1, ForwardIterator1 last1,
+ find_first_of(ForwardIterator1 first1, ForwardIterator1 last1,
ForwardIterator2 first2, ForwardIterator2 last2,
BinaryPredicate pred)
{
@@ -139,7 +139,7 @@ namespace std{
}
++temp2;
}
-
+
}
return last1;
}
@@ -204,7 +204,7 @@ namespace std{
}
template<class InputIterator1, class InputIterator2> _UCXXEXPORT
- pair<InputIterator1, InputIterator2>
+ pair<InputIterator1, InputIterator2>
mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
{
while(first1 != last1){
@@ -274,7 +274,7 @@ namespace std{
ForwardIterator2 first2, ForwardIterator2 last2)
{
equal_to<typename iterator_traits<ForwardIterator1>::value_type> c;
- return search(first1, last1, first2, last2, c);
+ return search(first1, last1, first2, last2, c);
}
@@ -322,7 +322,7 @@ namespace std{
}
++first;
}
- return first;
+ return first;
}
@@ -346,7 +346,7 @@ namespace std{
}
++first;
}
- return first;
+ return first;
}
@@ -976,7 +976,7 @@ namespace std{
first = middle;
}
}
-
+
if( !comp(*first, value) ){
return first;
}
@@ -1024,7 +1024,7 @@ namespace std{
first = middle;
}
}
-
+
if( comp(value, *first) ){
return first;
}
@@ -1084,10 +1084,10 @@ namespace std{
if( !comp(*first, value) && !comp(value, *first) ){
return true;
- }
+ }
if( !comp(*last, value) && !comp(value, *last) ){
return true;
- }
+ }
return false;
}
@@ -1301,7 +1301,7 @@ namespace std{
while( first2 != last2 && !comp( *temp, *first2) ){
++first2;
}
-
+
}else{ //They are identical - skip
//Elliminate duplicates
InputIterator1 temp = first1;
@@ -1356,7 +1356,7 @@ namespace std{
while( first2 != last2 && !comp( *temp, *first2) ){
++first2;
}
-
+
}else{ //They are identical - skip
//Elliminate duplicates
InputIterator1 temp = first1;
@@ -1630,7 +1630,7 @@ namespace std{
return false;
}
}
-
+
}
@@ -1640,7 +1640,7 @@ namespace std{
less<typename iterator_traits<BidirectionalIterator>::value_type> c;
return prev_permutation(first, last, c);
}
-
+
template<class BidirectionalIterator, class Compare> _UCXXEXPORT
bool prev_permutation(BidirectionalIterator first, BidirectionalIterator last, Compare comp)
{
diff --git a/include/associative_base b/include/associative_base
index af1dd0c..e7cbbad 100644
--- a/include/associative_base
+++ b/include/associative_base
@@ -161,7 +161,7 @@ public:
}
return retval;
}
- const_iterator find(const key_type& x) const{
+ const_iterator find(const key_type& x) const{
const_iterator retval = lower_bound(x);
if(retval == end()){
return retval;
@@ -171,7 +171,7 @@ public:
}
return retval;
}
- size_type count(const key_type& x) const{
+ size_type count(const key_type& x) const{
size_type retval(0);
const_iterator first = lower_bound(x);
while(first != end() && !c(x, value_to_key(*first))){
@@ -188,7 +188,7 @@ public:
void erase(iterator pos){
backing.erase(pos.base_iterator());
}
- size_type erase(const key_type& x){
+ size_type erase(const key_type& x){
size_type count(0);
iterator start = lower_bound(x);
iterator end = upper_bound(x);
@@ -198,7 +198,7 @@ public:
}
return count;
}
- void erase(iterator first, iterator last){
+ void erase(iterator first, iterator last){
while(first != last){
backing.erase(first.base_iterator());
++first;
diff --git a/include/exception b/include/exception
index 87cb103..bdf393e 100644
--- a/include/exception
+++ b/include/exception
@@ -9,12 +9,12 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2, or (at your option)
// any later version.
-//
+//
// GNU CC is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with GNU CC; see the file COPYING. If not, write to
// the Free Software Foundation, 59 Temple Place - Suite 330,
@@ -41,7 +41,7 @@
extern "C++" {
-namespace std
+namespace std
{
/**
* @brief Base class for all library exceptions.
@@ -51,7 +51,7 @@ namespace std
* your own %exception classes, or use a different hierarchy, or to
* throw non-class data (e.g., fundamental types).
*/
- class exception
+ class exception
{
public:
exception() throw() { }
@@ -63,7 +63,7 @@ namespace std
/** If an %exception is thrown which is not listed in a function's
* %exception specification, one of these may be thrown. */
- class bad_exception : public exception
+ class bad_exception : public exception
{
public:
bad_exception() throw() { }
@@ -114,7 +114,7 @@ namespace __gnu_cxx
*/
void __verbose_terminate_handler ();
} // namespace __gnu_cxx
-
+
} // extern "C++"
#endif
diff --git a/include/functional b/include/functional
index 8a9dd3b..b7932e2 100644
--- a/include/functional
+++ b/include/functional
@@ -60,7 +60,7 @@ namespace std{
template <class Arg, class Result> class pointer_to_unary_function;
template <class Arg, class Result> pointer_to_unary_function<Arg,Result> ptr_fun(Result (*)(Arg));
template <class Arg1, class Arg2, class Result> class pointer_to_binary_function;
- template <class Arg1, class Arg2, class Result>
+ template <class Arg1, class Arg2, class Result>
pointer_to_binary_function<Arg1,Arg2,Result> ptr_fun(Result (*)(Arg1,Arg2));
template<class S, class T> class mem_fun_t;
@@ -165,7 +165,7 @@ namespace std{
return (x && y);
}
};
-
+
template <class T> struct _UCXXEXPORT logical_or : binary_function<T,T,bool> {
bool operator()(const T& x, const T& y) const{
return (x || y);
@@ -218,7 +218,7 @@ namespace std{
template <class Operation> class _UCXXEXPORT binder1st
- : public unary_function<typename Operation::second_argument_type,
+ : public unary_function<typename Operation::second_argument_type,
typename Operation::result_type>
{
protected:
@@ -231,7 +231,7 @@ namespace std{
}
};
-
+
template <class Operation, class T> _UCXXEXPORT binder1st<Operation> bind1st(const Operation& op, const T& x){
return binder1st<Operation>(op, typename Operation::first_argument_type(x));
}
@@ -251,15 +251,15 @@ namespace std{
}
};
-
- template <class Operation, class T> _UCXXEXPORT
+
+ template <class Operation, class T> _UCXXEXPORT
binder2nd<Operation> bind2nd(const Operation& op, const T& x)
{
return binder2nd<Operation>(op, typename Operation::second_argument_type(x));
}
-
- template <class Arg, class Result> class _UCXXEXPORT
+
+ template <class Arg, class Result> class _UCXXEXPORT
pointer_to_unary_function : public unary_function<Arg, Result>
{
protected:
@@ -271,13 +271,13 @@ namespace std{
}
};
-
+
template <class Arg, class Result> _UCXXEXPORT pointer_to_unary_function<Arg, Result> ptr_fun(Result (*f)(Arg)){
return pointer_to_unary_function<Arg, Result>(f);
}
-
- template <class Arg1, class Arg2, class Result> class _UCXXEXPORT
+
+ template <class Arg1, class Arg2, class Result> class _UCXXEXPORT
pointer_to_binary_function : public binary_function<Arg1,Arg2,Result>
{
protected:
@@ -289,13 +289,13 @@ namespace std{
}
};
- template <class Arg1, class Arg2, class Result> _UCXXEXPORT
+ template <class Arg1, class Arg2, class Result> _UCXXEXPORT
pointer_to_binary_function<Arg1,Arg2,Result> ptr_fun(Result (*f)(Arg1, Arg2))
{
return pointer_to_binary_function<Arg1,Arg2,Result>(f);
}
-
+
template <class S, class T> class _UCXXEXPORT mem_fun_t
: public unary_function<T*, S>
{
@@ -361,11 +361,11 @@ namespace std{
{
public:
explicit mem_fun_ref_t(S (T::*p)()) : mf(p) { }
- S operator()(T& p) { return (p.*mf)(); }
+ S operator()(T& p) { return (p.*mf)(); }
private:
S (T::*mf)();
};
-
+
template <class S, class T, class A> class _UCXXEXPORT mem_fun1_ref_t
: public binary_function<T, A, S>
{
@@ -405,13 +405,13 @@ public:
}
};
-template <class Op1, class Op2> _UCXXEXPORT
+template <class Op1, class Op2> _UCXXEXPORT
inline unary_compose<Op1, Op2>
compose1(const Op1& fn1, const Op2& fn2){
return unary_compose<Op1, Op2>(fn1, fn2);
}
-template <class Op1, class Op2, class Op3> class _UCXXEXPORT binary_compose :
+template <class Op1, class Op2, class Op3> class _UCXXEXPORT binary_compose :
public std::unary_function<typename Op2::argument_type, typename Op1::result_type>
{
protected:
diff --git a/include/ios b/include/ios
index b1bf847..63dc4ed 100644
--- a/include/ios
+++ b/include/ios
@@ -150,7 +150,7 @@ namespace std{
inline static bool sync_with_stdio(bool = true) { return true; }
protected:
- _UCXXEXPORT ios_base() : mLocale(), mformat(dec | skipws ), mstate(goodbit),
+ _UCXXEXPORT ios_base() : mLocale(), mformat(dec | skipws ), mstate(goodbit),
mmode(), mdir(), mprecision(6), mwidth(0)
#ifdef __UCLIBCXX_SUPPORT_CDIR__
,mInit()
@@ -355,7 +355,7 @@ namespace std{
_UCXXEXPORT basic_ostream<charT,traits>* tie(basic_ostream<charT,traits>* tiestr){
basic_ostream<charT,traits>* retval= mtied;
mtied = tiestr;
- return retval;
+ return retval;
}
_UCXXEXPORT basic_streambuf<charT,traits>* rdbuf() const{
return mstreambuf;
@@ -398,7 +398,7 @@ namespace std{
#ifdef __UCLIBCXX_EXPAND_IOS_CHAR__
#ifndef __UCLIBCXX_COMPILE_IOS__
-
+
template <> _UCXXEXPORT void basic_ios<char, char_traits<char> >::clear(iostate state);
template <> _UCXXEXPORT void basic_ios<char, char_traits<char> >::setstate(iostate state);
@@ -432,14 +432,14 @@ namespace std{
#endif //__UCLIBCXX_HAS_WCHAR__
- template <class charT, class traits>
+ template <class charT, class traits>
inline typename basic_ios<charT, traits>::char_type
basic_ios<charT, traits>::widen(char c) const
{
return c;
}
- template <>
+ template <>
inline basic_ios<char, char_traits<char> >::char_type
basic_ios<char, char_traits<char> >::widen(char c) const
{
@@ -448,7 +448,7 @@ namespace std{
#ifdef __UCLIBCXX_HAS_WCHAR__
- template <>
+ template <>
inline basic_ios<wchar_t, char_traits<wchar_t> >::char_type
basic_ios<wchar_t, char_traits<wchar_t> >::widen(char c) const
{
diff --git a/include/istream b/include/istream
index caeda5d..d67f48f 100644
--- a/include/istream
+++ b/include/istream
@@ -42,23 +42,23 @@ namespace std{
virtual public basic_ios<charT,traits>
{
public:
-
+
typedef charT char_type;
typedef typename traits::int_type int_type;
typedef typename traits::pos_type pos_type;
typedef typename traits::off_type off_type;
typedef basic_streambuf<charT,traits> streambuf_type;
typedef traits traits_type;
-
+
explicit basic_istream(basic_streambuf<charT,traits>* sb)
: basic_ios<charT, traits>(sb), count_last_ufmt_input(0)
{
basic_ios<charT, traits>::init(sb);
}
virtual ~basic_istream() { }
-
+
class sentry;
-
+
basic_istream<charT,traits>& operator>>(basic_istream<charT,traits>& (*pf)(basic_istream<charT,traits>&));
basic_istream<charT,traits>& operator>>(basic_ios<charT,traits>& (*pf)(basic_ios<charT,traits>&));
basic_istream<charT,traits>& operator>>(ios_base& (*pf)(ios_base&));
@@ -77,18 +77,18 @@ namespace std{
basic_istream<charT,traits>& operator>>(double& f);
basic_istream<charT,traits>& operator>>(long double& f);
#endif
-
+
_UCXXEXPORT streamsize gcount() const{
return count_last_ufmt_input;
}
-
+
_UCXXEXPORT int_type get(); //below
- _UCXXEXPORT basic_istream<charT,traits>& get(char_type& c); //Below
-
+ _UCXXEXPORT basic_istream<charT,traits>& get(char_type& c); //Below
+
_UCXXEXPORT basic_istream<charT,traits>& get(char_type* s, streamsize n){
return get(s, n, basic_ios<charT,traits>::widen('\n'));
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& get(char_type* s, streamsize n, char_type delim){
sentry(*this, true);
streamsize i = 0;
@@ -117,11 +117,11 @@ namespace std{
count_last_ufmt_input = i;
return *this;
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& get(basic_streambuf<char_type,traits>& sb){
return get(sb, basic_ios<charT,traits>::widen('\n'));
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& get(basic_streambuf<char_type,traits>& sb, char_type delim){
sentry(*this, true);
streamsize i = 0;
@@ -150,13 +150,13 @@ namespace std{
}
++i;
basic_ios<charT, traits>::mstreambuf->sbumpc();
- }
+ }
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& getline(char_type* s, streamsize n){
return getline(s, n, basic_ios<charT,traits>::widen('\n'));
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& getline(char_type* s, streamsize n, char_type delim){
sentry(*this, true);
streamsize i = 0;
@@ -186,7 +186,7 @@ namespace std{
s[n-1] = traits::eos();
return *this;
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& ignore (streamsize n = 1, int_type delim = traits::eof()){
sentry(*this, true);
streamsize i;
@@ -204,7 +204,7 @@ namespace std{
}
return *this;
}
-
+
_UCXXEXPORT int_type peek(){
if(basic_ios<charT,traits>::good() == false){
return traits::eof();
@@ -216,7 +216,7 @@ namespace std{
return basic_ios<charT, traits>::mstreambuf->sgetc();
}
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& read (char_type* s, streamsize n){
sentry(*this, true);
streamsize i;
@@ -236,7 +236,7 @@ namespace std{
count_last_ufmt_input = n;
return *this;
}
-
+
_UCXXEXPORT streamsize readsome(char_type* s, streamsize n){
sentry(*this, true);
if(!basic_ios<charT,traits>::good()){
@@ -244,20 +244,20 @@ namespace std{
basic_ios<charT,traits>::setstate(ios_base::failbit);
return 0;
}
-
+
if( basic_ios<charT, traits>::mstreambuf->in_avail() == -1){
count_last_ufmt_input=0;
basic_ios<charT,traits>::setstate(ios_base::eofbit);
return 0;
}
-
+
if(n > basic_ios<charT, traits>::mstreambuf->in_avail() ){
n = basic_ios<charT, traits>::mstreambuf->in_avail();
}
-
+
streamsize i;
int_type c;
-
+
for(i=0;i<n;++i){
c = basic_ios<charT, traits>::mstreambuf->sgetc();
basic_ios<charT, traits>::mstreambuf->sbumpc();
@@ -266,7 +266,7 @@ namespace std{
count_last_ufmt_input = n;
return n;
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& putback(char_type c){
sentry(*this, true);
if(!basic_ios<charT,traits>::good()){
@@ -283,7 +283,7 @@ namespace std{
}
return *this;
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& unget(){
sentry(*this, true);
if(!basic_ios<charT,traits>::good()){
@@ -299,7 +299,7 @@ namespace std{
}
return *this;
}
-
+
_UCXXEXPORT int sync(){
sentry(*this, true);
if(basic_ios<charT, traits>::mstreambuf == 0){
@@ -311,35 +311,35 @@ namespace std{
}
return 0;
}
-
+
_UCXXEXPORT pos_type tellg(){
if(basic_ios<charT,traits>::fail() !=false){
return pos_type(-1);
}
return basic_ios<charT, traits>::mstreambuf->pubseekoff(0, ios_base::cur, ios_base::in);
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& seekg(pos_type pos){
if(basic_ios<charT,traits>::fail() !=true){
- basic_ios<charT, traits>::mstreambuf->pubseekpos(pos);
+ basic_ios<charT, traits>::mstreambuf->pubseekpos(pos);
}
- return *this;
+ return *this;
}
-
+
_UCXXEXPORT basic_istream<charT,traits>& seekg(off_type off, ios_base::seekdir dir){
if(basic_ios<charT,traits>::fail() !=true){
basic_ios<charT, traits>::mstreambuf->pubseekoff(off, dir);
}
return *this;
}
-
+
protected:
_UCXXEXPORT basic_istream(const basic_istream<charT,traits> &): basic_ios<charT, traits>() { }
_UCXXEXPORT basic_istream<charT,traits> & operator=(const basic_istream<charT,traits> &){ return *this; }
streamsize count_last_ufmt_input;
};
-
+
template <class charT,class traits = char_traits<charT> > class _UCXXEXPORT basic_istream<charT,traits>::sentry {
bool ok;
public:
@@ -362,7 +362,7 @@ namespace std{
return ok;
}
};
-
+
//Template implementations of basic_istream functions which may be partially specialized
//For code reduction
@@ -395,9 +395,9 @@ namespace std{
}
return *this;
}
-
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(bool& n)
{
sentry(*this);
@@ -405,7 +405,7 @@ namespace std{
return *this;
}
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(short& n)
{
sentry(*this);
@@ -413,7 +413,7 @@ namespace std{
return *this;
}
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(unsigned short& n)
{
sentry(*this);
@@ -439,7 +439,7 @@ namespace std{
return *this;
}
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(unsigned long int& n)
{
sentry(*this);
@@ -448,21 +448,21 @@ namespace std{
}
#ifdef __UCLIBCXX_HAS_FLOATS__
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(float& n)
{
sentry(*this);
__istream_readin<traits, charT, float>::readin(*this, n);
return *this;
}
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(double& n)
{
sentry(*this);
__istream_readin<traits, charT, double>::readin(*this, n);
return *this;
}
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(long double& n)
{
sentry(*this);
@@ -470,7 +470,7 @@ namespace std{
return *this;
}
#endif
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(void *& n)
{
sentry(*this);
@@ -538,7 +538,7 @@ namespace std{
return is;
}
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(basic_istream<charT,traits>& (*pf)(basic_istream<charT,traits>&))
{
sentry(*this);
@@ -546,7 +546,7 @@ namespace std{
return *this;
}
- template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
+ template <class charT, class traits> _UCXXEXPORT basic_istream<charT,traits>&
basic_istream<charT,traits>::operator>>(basic_ios<charT,traits>& (*pf)(basic_ios<charT,traits>&))
{
sentry(*this);
@@ -590,8 +590,6 @@ namespace std{
#endif
#endif
-
-
}
diff --git a/include/istream_helpers b/include/istream_helpers
index 1d25486..ddece1c 100644
--- a/include/istream_helpers
+++ b/include/istream_helpers
@@ -42,7 +42,7 @@ namespace std{
* require different scanf functions
*/
- template <class C, class traits> _UCXXEXPORT
+ template <class C, class traits> _UCXXEXPORT
basic_string<C, traits> _readToken(basic_istream<C, traits>& stream)
{
basic_string<C, traits> temp;
@@ -62,7 +62,7 @@ namespace std{
return temp;
}
- template <class C, class traits> _UCXXEXPORT
+ template <class C, class traits> _UCXXEXPORT
basic_string<C, traits> _readTokenDecimal(basic_istream<C, traits>& stream)
{
basic_string<C, traits> temp;
@@ -135,7 +135,6 @@ namespace std{
}
}else{
sscanf(temp.c_str(), "%hi", &var);
-
}
}
}
@@ -215,7 +214,7 @@ namespace std{
}else{
sscanf(temp.c_str(), "%i", (int *)(&var) );
}
- }
+ }
}
};
@@ -331,8 +330,7 @@ namespace std{
while (
!traits::eq_int_type((c = is.rdbuf()->sgetc()), eof)
&& isspace(c)
- )
- {
+ ) {
is.rdbuf()->sbumpc();
}
if(traits::eq_int_type(c, eof)){
diff --git a/include/iterator b/include/iterator
index c0ba25e..b3d81b2 100644
--- a/include/iterator
+++ b/include/iterator
@@ -34,19 +34,19 @@ namespace std{
// subclause _lib.stream.iterators_, stream iterators:
template <class T, class charT = char, class traits = char_traits<charT>, class Distance = ptrdiff_t> class istream_iterator;
- template <class T, class charT, class traits, class Distance> bool
+ template <class T, class charT, class traits, class Distance> bool
operator==(const istream_iterator<T,charT,traits,Distance>& x, const istream_iterator<T,charT,traits,Distance>& y);
- template <class T, class charT, class traits, class Distance> bool
+ template <class T, class charT, class traits, class Distance> bool
operator!=(const istream_iterator<T,charT,traits,Distance>& x, const istream_iterator<T,charT,traits,Distance>& y);
template <class T, class charT = char, class traits = char_traits<charT> > class ostream_iterator;
template<class charT, class traits = char_traits<charT> > class istreambuf_iterator;
- template <class charT, class traits> bool
+ template <class charT, class traits> bool
operator==(const istreambuf_iterator<charT,traits>& a, const istreambuf_iterator<charT,traits>& b);
- template <class charT, class traits> bool
+ template <class charT, class traits> bool
operator!=(const istreambuf_iterator<charT,traits>& a, const istreambuf_iterator<charT,traits>& b);
template <class charT, class traits = char_traits<charT> > class ostreambuf_iterator;
-
+
template < class T, class charT, class traits, class Distance > class _UCXXEXPORT istream_iterator
: public iterator<input_iterator_tag,T,Distance,const T*, const T&>
{
@@ -85,14 +85,14 @@ namespace std{
T value;
};
- template <class T, class charT, class traits, class Distance> _UCXXEXPORT
+ template <class T, class charT, class traits, class Distance> _UCXXEXPORT
bool operator==(const istream_iterator<T,charT,traits,Distance>& x,
const istream_iterator<T,charT,traits,Distance>& y)
{
return x.m_equal(y);
}
- template <class T, class charT, class traits, class Distance> _UCXXEXPORT
+ template <class T, class charT, class traits, class Distance> _UCXXEXPORT
bool operator!=(const istream_iterator<T,charT,traits,Distance>& x,
const istream_iterator<T,charT,traits,Distance>& y)
{
@@ -126,7 +126,7 @@ namespace std{
const char* delim;
};
- template<class charT, class traits > class _UCXXEXPORT istreambuf_iterator :
+ template<class charT, class traits > class _UCXXEXPORT istreambuf_iterator :
public iterator<input_iterator_tag, charT, typename traits::off_type, charT*, charT&>
{
public:
@@ -139,7 +139,7 @@ namespace std{
class _UCXXEXPORT proxy{
charT val;
basic_streambuf<charT, traits> * buf;
-
+
proxy(charT v, basic_streambuf<charT, traits> * b) : val(v), buf(b) { }
public:
charT operator*() { return val; }
@@ -180,7 +180,7 @@ namespace std{
return a.equal(b);
}
- template <class charT, class traits> bool _UCXXEXPORT
+ template <class charT, class traits> bool _UCXXEXPORT
operator!=(const istreambuf_iterator<charT,traits>& a,
const istreambuf_iterator<charT,traits>& b)
{
diff --git a/include/iterator_base b/include/iterator_base
index af59bbc..1cae589 100644
--- a/include/iterator_base
+++ b/include/iterator_base
@@ -43,7 +43,7 @@ namespace std{
}
}
- template <class InputIterator> _UCXXEXPORT typename iterator_traits<InputIterator>::difference_type
+ template <class InputIterator> _UCXXEXPORT typename iterator_traits<InputIterator>::difference_type
distance(InputIterator first, InputIterator last)
{
typename iterator_traits<InputIterator>::difference_type d = 0;
@@ -63,7 +63,7 @@ namespace std{
template <class Iterator> bool operator<=(const reverse_iterator<Iterator>& x, const reverse_iterator<Iterator>& y);
template <class Iterator> typename reverse_iterator<Iterator>::difference_type
operator-( const reverse_iterator<Iterator>& x, const reverse_iterator<Iterator>& y);
- template <class Iterator> reverse_iterator<Iterator>
+ template <class Iterator> reverse_iterator<Iterator>
operator+( typename reverse_iterator<Iterator>::difference_type n, const reverse_iterator<Iterator>& x);
template <class Container> class back_insert_iterator;
template <class Container> back_insert_iterator<Container> back_inserter(Container& x);
@@ -72,7 +72,7 @@ namespace std{
template <class Container> class insert_iterator;
template <class Container, class Iterator>
insert_iterator<Container> inserter(Container& x, Iterator i);
-
+
//Actual Template definitions
template<class Iterator> struct _UCXXEXPORT iterator_traits {
@@ -115,7 +115,7 @@ namespace std{
};*/
- template <class Category, class T, class Distance, class Pointer, class Reference>
+ template <class Category, class T, class Distance, class Pointer, class Reference>
struct _UCXXEXPORT iterator
{
typedef T value_type;
@@ -143,7 +143,7 @@ namespace std{
explicit reverse_iterator(Iterator x) : current(x) { }
template<class U> reverse_iterator(const reverse_iterator<U> &x) : current(x.base()){}
- Iterator base() const { return current; } // explicit
+ Iterator base() const { return current; } // explicit
typename iterator_traits<Iterator>::reference operator*() const { Iterator tmp = current; return *--tmp; }
typename iterator_traits<Iterator>::pointer operator->() const { return &(operator*()); }
@@ -218,7 +218,7 @@ namespace std{
return reverse_iterator<Iterator> (x.base() - n);
}
- template <class Container> class _UCXXEXPORT back_insert_iterator :
+ template <class Container> class _UCXXEXPORT back_insert_iterator :
public iterator<output_iterator_tag,void,void,void,void>
{
protected:
@@ -285,7 +285,7 @@ namespace std{
++iter;
return *this;
}
- insert_iterator<Container>& operator*() { return *this; }
+ insert_iterator<Container>& operator*() { return *this; }
insert_iterator<Container>& operator++() { return *this; }
insert_iterator<Container> operator++(int) { return *this; }
};
diff --git a/include/list b/include/list
index aa0905e..de8edad 100644
--- a/include/list
+++ b/include/list
@@ -57,7 +57,7 @@ namespace std{
explicit list(const Allocator& = Allocator());
explicit list(size_type n, const T& value = T(), const Allocator& = Allocator());
- template <class InputIterator> list(InputIterator first, InputIterator last,
+ template <class InputIterator> list(InputIterator first, InputIterator last,
const Allocator& al= Allocator());
list(const list<T,Allocator>& x);
~list();
@@ -150,10 +150,10 @@ namespace std{
//List iterator
template <class T, class Allocator> class _UCXXEXPORT list<T, Allocator>::iter_list
: public std::iterator<
- bidirectional_iterator_tag,
- T,
- typename Allocator::difference_type,
- typename Allocator::pointer,
+ bidirectional_iterator_tag,
+ T,
+ typename Allocator::difference_type,
+ typename Allocator::pointer,
typename Allocator::reference
>
{
@@ -200,7 +200,7 @@ namespace std{
iter_list temp(current);
current = current->next;
return temp;
- }
+ }
iter_list & operator--(){
current = current->previous;
return *this;
@@ -299,20 +299,20 @@ namespace std{
y->val = v;
}
- template<class T, class Allocator> typename list<T, Allocator>::iterator
+ template<class T, class Allocator> typename list<T, Allocator>::iterator
list<T, Allocator>::begin()
{
return iterator(list_start);
}
-
+
template<class T, class Allocator> typename list<T, Allocator>::const_iterator
list<T, Allocator>::begin() const
{
return const_iterator(list_start);
}
-
+
template<class T, class Allocator> typename list<T, Allocator>::iterator
list<T, Allocator>::end()
{
@@ -452,7 +452,7 @@ namespace std{
}
- template<class T, class Allocator> typename list<T, Allocator>::iterator
+ template<class T, class Allocator> typename list<T, Allocator>::iterator
list<T, Allocator>::insert(iterator position, const T& x)
{
node * temp = new node(x);
@@ -576,26 +576,25 @@ namespace std{
//Link everything we need
x.list_start->previous = position.link_struct()->previous;
position.link_struct()->previous->next = x.list_start;
-
+
position.link_struct()->previous = x.list_end->previous;
x.list_end->previous->next = position.link_struct();
//Clean up the other list
-
+
x.list_start = x.list_end;
x.list_end->previous=0;
}
template<class T, class Allocator>
- void list<T, Allocator>::splice(iterator position, list<T,Allocator>& x, iterator i)
+ void list<T, Allocator>::splice(iterator position, list<T,Allocator>& x, iterator i)
{
//Invalid conditions
if( x.elements == 0 || i == position || position.link_struct() == i.link_struct()->next ){
return;
}
-
//Do we need to adjust the begining pointer?
if(i == x.begin()){
x.list_start = x.list_start->next;
@@ -627,7 +626,7 @@ namespace std{
i.link_struct()->next->previous = 0;
x.list_start = i.link_struct()->next;
}
-
+
i.link_struct()->previous = position.link_struct()->previous;
position.link_struct()->previous->next = i.link_struct();
@@ -706,7 +705,7 @@ namespace std{
merge(x, c);
}
- template<class T, class Allocator> template <class Compare>
+ template<class T, class Allocator> template <class Compare>
void list<T, Allocator>::merge(list<T,Allocator>& x, Compare comp)
{
iterator source = x.begin();
diff --git a/include/locale b/include/locale
index f6d08dc..96e6bc9 100644
--- a/include/locale
+++ b/include/locale
@@ -44,7 +44,7 @@ namespace std{
// construct/copy/destroy:
locale() throw(){
return;
- }
+ }
locale(const locale& other) throw(){
(void)other;
return;
diff --git a/include/set b/include/set
index b9dc10f..f376e47 100644
--- a/include/set
+++ b/include/set
@@ -185,11 +185,11 @@ protected:
/* Non-member functions. These are at the end because they are not associated with any
- particular class. These will be implemented as I figure out exactly what all of
+ particular class. These will be implemented as I figure out exactly what all of
them are supposed to do, and I have time.
*/
- template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator<
+ template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator<
(const set<Key,Compare,Allocator>& x, const set<Key,Compare,Allocator>& y)
{
typename set<Key,Compare,Allocator>::const_iterator first1 = x.begin();
@@ -207,7 +207,7 @@ protected:
++first1;
++first2;
}
- return first1==last1 && first2 != last2;
+ return first1==last1 && first2 != last2;
}
template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator>
@@ -228,7 +228,7 @@ protected:
++first1;
++first2;
}
- return first1!=last1 && first2 == last2;
+ return first1!=last1 && first2 == last2;
}
template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator>=
@@ -249,7 +249,7 @@ protected:
++first1;
++first2;
}
- return first1!=last1;
+ return first1!=last1;
}
template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator<=
@@ -270,7 +270,7 @@ protected:
++first1;
++first2;
}
- return first2!=last2;
+ return first2!=last2;
}
template <class Key, class Compare, class Allocator> _UCXXEXPORT void swap
(set<Key,Compare,Allocator>& x, set<Key,Compare,Allocator>& y)
@@ -288,7 +288,7 @@ protected:
return false;
}
- template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator<
+ template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator<
(const multiset<Key,Compare,Allocator>& x, const multiset<Key,Compare,Allocator>& y)
{
typename multiset<Key,Compare,Allocator>::const_iterator first1 = x.begin();
@@ -306,7 +306,7 @@ protected:
++first1;
++first2;
}
- return first1==last1 && first2 != last2;
+ return first1==last1 && first2 != last2;
}
template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator!=
@@ -324,10 +324,10 @@ protected:
++first1;
++first2;
}
- return first1!=last1 || first2 != last2;
+ return first1!=last1 || first2 != last2;
}
- template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator>
+ template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator>
(const multiset<Key,Compare,Allocator>& x, const multiset<Key,Compare,Allocator>& y)
{
typename multiset<Key,Compare,Allocator>::const_iterator first1 = x.begin();
@@ -345,7 +345,7 @@ protected:
++first1;
++first2;
}
- return first1!=last1 && first2 == last2;
+ return first1!=last1 && first2 == last2;
}
template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator>=
@@ -366,9 +366,9 @@ protected:
++first1;
++first2;
}
- return first1!=last1;
+ return first1!=last1;
}
-
+
template <class Key, class Compare, class Allocator> _UCXXEXPORT bool operator<=
(const multiset<Key,Compare,Allocator>& x, const multiset<Key,Compare,Allocator>& y)
{
@@ -387,7 +387,7 @@ protected:
++first1;
++first2;
}
- return first2!=last2;
+ return first2!=last2;
}
template <class Key, class Compare, class Allocator> _UCXXEXPORT void swap
@@ -404,4 +404,3 @@ protected:
#endif
-
diff --git a/include/string b/include/string
index ad86de7..644c56e 100644
--- a/include/string
+++ b/include/string
@@ -89,7 +89,7 @@ public:
}
_UCXXEXPORT basic_string(const Ch* s, const A& al = A()); //Below
-
+
_UCXXEXPORT basic_string(size_type n, Ch c, const A& al = A())
: vector<Ch, A>(n, c, al)
{
@@ -98,7 +98,7 @@ public:
template<class InputIterator> _UCXXEXPORT basic_string(InputIterator begin, InputIterator end, const A& a = A())
:vector<Ch, A>(begin, end)
{
-
+
}
_UCXXEXPORT ~basic_string() {
@@ -167,7 +167,7 @@ public:
Tr::copy( vector<Ch, A>::data + temp, str.vector<Ch, A>::data + pos, rlen);
return *this;
}
-
+
_UCXXEXPORT basic_string& append(const Ch* s, size_type n){
size_t temp = vector<Ch, A>::elements;
resize(vector<Ch, A>::elements + n);
@@ -368,7 +368,7 @@ public:
_UCXXEXPORT basic_string& replace(size_type pos, size_type n1, const Ch* s, size_type n2){
return replace(pos,n1,basic_string<Ch,Tr,A>(s,n2));
-
+
}
inline _UCXXEXPORT basic_string& replace(size_type pos, size_type n1, const Ch* s){
@@ -514,15 +514,15 @@ public:
bool foundCharacter;
for(size_type i = pos; i < length(); ++i){
foundCharacter = false;
- for(size_type j = 0; j < str.length() ; ++j){
- if( Tr::eq(str[j], operator[](i)) ){
+ for(size_type j = 0; j < str.length() ; ++j){
+ if( Tr::eq(str[j], operator[](i)) ){
foundCharacter = true;
- }
- }
+ }
+ }
if(foundCharacter == false){
return i;
}
- }
+ }
return npos;
}
@@ -545,7 +545,7 @@ public:
if(xpos > pos){
xpos = pos;
}
-
+
while(xpos != npos && npos != str.find_first_of(at(xpos))){
--xpos;
}
@@ -675,7 +675,7 @@ template<class Ch,class Tr,class A> _UCXXEXPORT basic_string<Ch,Tr,A>::basic_str
}
template<class Ch,class Tr,class A> _UCXXEXPORT basic_string<Ch,Tr,A>::
- basic_string(const basic_string& str, size_type pos, size_type n, const A& al)
+ basic_string(const basic_string& str, size_type pos, size_type n, const A& al)
: vector<Ch, A>(al)
{
if(pos>str.size()){
@@ -692,7 +692,7 @@ template<class Ch,class Tr,class A> _UCXXEXPORT basic_string<Ch,Tr,A>::
template<class Ch,class Tr,class A> _UCXXEXPORT basic_string<Ch,Tr,A>&
basic_string<Ch,Tr,A>::operator=(const basic_string<Ch,Tr,A> & str)
{
- if(&str == this){ //Check if we are doing a=a
+ if(&str == this){ //Check if we are doing a=a
return *this;
}
vector<Ch, A>::clear();
@@ -790,7 +790,7 @@ template<class Ch,class Tr,class A>
//typedef basic_string<char> string;
-template<class charT, class traits, class Allocator> _UCXXEXPORT basic_string<charT,traits,Allocator>
+template<class charT, class traits, class Allocator> _UCXXEXPORT basic_string<charT,traits,Allocator>
operator+(const basic_string<charT,traits,Allocator>& lhs, const basic_string<charT,traits,Allocator>& rhs)
{
basic_string<charT,traits,Allocator> temp(lhs);
@@ -831,7 +831,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT basic_string<ch
return temp;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator==(const basic_string<charT,traits,Allocator>& lhs, const basic_string<charT,traits,Allocator>& rhs)
{
if(lhs.compare(rhs) == 0){
@@ -840,7 +840,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator==(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs)
{
if(rhs.compare(lhs) == 0){
@@ -849,7 +849,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator==(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs)
{
if(lhs.compare(rhs)==0){
@@ -858,7 +858,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator!=(const basic_string<charT,traits,Allocator>& lhs, const basic_string<charT,traits,Allocator>& rhs)
{
if(lhs.compare(rhs) !=0){
@@ -867,21 +867,21 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator!=(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs)
{
basic_string<charT,traits,Allocator> temp(lhs);
return (temp != rhs);
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator!=(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs)
{
basic_string<charT,traits,Allocator> temp(rhs);
return (lhs != temp);
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator< (const basic_string<charT,traits,Allocator>& lhs, const basic_string<charT,traits,Allocator>& rhs)
{
if(lhs.compare(rhs) < 0){
@@ -890,7 +890,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator< (const basic_string<charT,traits,Allocator>& lhs, const charT* rhs)
{
basic_string<charT,traits,Allocator> temp(rhs);
@@ -900,7 +900,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator< (const charT* lhs, const basic_string<charT,traits,Allocator>& rhs)
{
basic_string<charT,traits,Allocator> temp(lhs);
@@ -911,7 +911,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator> (const basic_string<charT,traits,Allocator>& lhs, const basic_string<charT,traits,Allocator>& rhs)
{
if(lhs.compare(rhs) > 0){
@@ -920,7 +920,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator> (const basic_string<charT,traits,Allocator>& lhs, const charT* rhs)
{
basic_string<charT,traits,Allocator> temp(rhs);
@@ -930,7 +930,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator> (const charT* lhs, const basic_string<charT,traits,Allocator>& rhs)
{
basic_string<charT,traits,Allocator> temp(lhs);
@@ -940,7 +940,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator<=(const basic_string<charT,traits,Allocator>& lhs, const basic_string<charT,traits,Allocator>& rhs)
{
if(lhs.compare(rhs) <=0){
@@ -949,7 +949,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator<=(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs)
{
basic_string<charT,traits,Allocator> temp(rhs);
@@ -959,7 +959,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator<=(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs)
{
basic_string<charT,traits,Allocator> temp(lhs);
@@ -969,7 +969,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator>=(const basic_string<charT,traits,Allocator>& lhs, const basic_string<charT,traits,Allocator>& rhs)
{
if(lhs.compare(rhs) >=0){
@@ -978,7 +978,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator>=(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs)
{
basic_string<charT,traits,Allocator> temp(rhs);
@@ -988,7 +988,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT bool
+template<class charT, class traits, class Allocator> _UCXXEXPORT bool
operator>=(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs)
{
basic_string<charT,traits,Allocator> temp(lhs);
@@ -998,7 +998,7 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT bool
return false;
}
-template<class charT, class traits, class Allocator> _UCXXEXPORT void
+template<class charT, class traits, class Allocator> _UCXXEXPORT void
swap(basic_string<charT,traits,Allocator>& lhs, basic_string<charT,traits,Allocator>& rhs)
{
lhs.swap(rhs);
diff --git a/include/support b/include/support
index ed0c7ca..9279987 100644
--- a/include/support
+++ b/include/support
@@ -57,9 +57,9 @@ static const _Unwind_Action _UA_HANDLER_FRAME = 4;
static const _Unwind_Action _UA_FORCE_UNWIND = 8;
const _Unwind_Exception_Class __uclibcxx_exception_class = ((((((((
- _Unwind_Exception_Class) 'u' << 8 | (_Unwind_Exception_Class) 'l') << 8
+ _Unwind_Exception_Class) 'u' << 8 | (_Unwind_Exception_Class) 'l') << 8
| (_Unwind_Exception_Class) 'i') << 8 | (_Unwind_Exception_Class) 'b') << 8
- | (_Unwind_Exception_Class) 'C')<< 8 | (_Unwind_Exception_Class) '+') << 8
+ | (_Unwind_Exception_Class) 'C')<< 8 | (_Unwind_Exception_Class) '+') << 8
| (_Unwind_Exception_Class) '+') << 8 | (_Unwind_Exception_Class) '\0');
@@ -93,14 +93,14 @@ struct _Unwind_Context;
_Unwind_Reason_Code _Unwind_RaiseException ( struct _Unwind_Exception *exception_object );
-//_Unwind_ForcedUnwind
+//_Unwind_ForcedUnwind
typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn)
(int version, _Unwind_Action actions, _Unwind_Exception_Class exceptionClass,
- struct _Unwind_Exception *exceptionObject,
+ struct _Unwind_Exception *exceptionObject,
struct _Unwind_Context *context, void *stop_parameter );
-_Unwind_Reason_Code _Unwind_ForcedUnwind (
+_Unwind_Reason_Code _Unwind_ForcedUnwind (
struct _Unwind_Exception *exception_object, _Unwind_Stop_Fn stop,
void *stop_parameter );
@@ -127,15 +127,15 @@ _Unwind_Reason_Code (*__personality_routine)
/*The following part is the Level II ABI which is required for compatability*/
//This might be the only stuff that *I* need to implement
-struct __cxa_exception {
+struct __cxa_exception {
std::type_info *exceptionType; //Type of thrown exception
- void (*exceptionDestructor) (void *); //Pointer to the destructor
+ void (*exceptionDestructor) (void *); //Pointer to the destructor
unexpected_handler unexpectedHandler; //Unexpected handler to use
terminate_handler terminateHandler; //Terminate handle to use
__cxa_exception *nextException; //per thread linked list
int handlerCount; //How many handlers have caught this
- int handlerSwitchValue;
+ int handlerSwitchValue;
const char *actionRecord;
const char *languageSpecificData;
void *catchTemp;
@@ -155,13 +155,11 @@ extern "C" __cxa_eh_globals *__cxa_get_globals_fast(void); //Same as above, assu
extern "C" void *__cxa_allocate_exception(size_t thrown_size); //Allocate space for exception plus header
extern "C" void __cxa_free_exception(void *thrown_exception); //Free space allocated from the above
-extern "C" void __cxa_throw (void *thrown_exception, //This is the actual throw call
-// std::type_info *tinfo, //Type of object
- void * tinfo, //Type of object
+extern "C" void __cxa_throw (void *thrown_exception, //This is the actual throw call
+// std::type_info *tinfo, //Type of object
+ void * tinfo, //Type of object
void (*dest) (void *) ); //Pointer to destructor destroy object
#endif
-
-
diff --git a/include/vector b/include/vector
index 2995c76..8310bc1 100644
--- a/include/vector
+++ b/include/vector
@@ -59,13 +59,13 @@ namespace std{
typedef std::reverse_iterator<iterator> reverse_iterator;
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
- explicit _UCXXEXPORT vector(const Allocator& al= Allocator()): data(0), //defaultValue(T()),
+ explicit _UCXXEXPORT vector(const Allocator& al= Allocator()): data(0), //defaultValue(T()),
data_size(__UCLIBCXX_STL_BUFFER_SIZE__), elements(0), a(al)
{
data = a.allocate(data_size);
}
- explicit _UCXXEXPORT vector(size_type n, const T& value = T(), const Allocator& al= Allocator()) :
+ explicit _UCXXEXPORT vector(size_type n, const T& value = T(), const Allocator& al= Allocator()) :
data(0), data_size(0), elements(0), a(al)
{
data_size = n + __UCLIBCXX_STL_BUFFER_SIZE__;
@@ -74,7 +74,7 @@ namespace std{
resize(n, value);
}
- template <class InputIterator> _UCXXEXPORT
+ template <class InputIterator> _UCXXEXPORT
vector(InputIterator first, InputIterator last, const Allocator& al = Allocator()):
data(0), data_size(__UCLIBCXX_STL_BUFFER_SIZE__), elements(0), a(al)
{
@@ -91,7 +91,7 @@ namespace std{
for(size_type i = 0; i < elements; i++){
a.construct(data+i, x.data[i]);
- }
+ }
}
_UCXXEXPORT ~vector(); //Below
@@ -264,7 +264,7 @@ namespace std{
}
}
- template <class InputIterator> _UCXXEXPORT
+ template <class InputIterator> _UCXXEXPORT
void _insert_from_iterator(iterator position, InputIterator first, InputIterator last)
{
T temp;
@@ -363,7 +363,7 @@ namespace std{
template<class T, class Allocator> _UCXXEXPORT void vector<T, Allocator>::reserve(size_type n){
- if(n > data_size){ //We never shrink...
+ if(n > data_size){ //We never shrink...
T * temp_ptr = data;
size_type temp_size = data_size;
@@ -479,7 +479,7 @@ namespace std{
operator< (const vector<T,Allocator>& x, const vector<T,Allocator>& y)
{
less<typename iterator_traits<typename vector<T,Allocator>::iterator >::value_type> c;
- return lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), c);
+ return lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), c);
}
template <class T, class Allocator> _UCXXEXPORT bool
operator!=(const vector<T,Allocator>& x, const vector<T,Allocator>& y)
@@ -490,19 +490,19 @@ namespace std{
operator> (const vector<T,Allocator>& x, const vector<T,Allocator>& y)
{
greater<typename iterator_traits<typename vector<T,Allocator>::iterator >::value_type> c;
- return lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), c);
+ return lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), c);
}
template <class T, class Allocator> _UCXXEXPORT bool
operator>=(const vector<T,Allocator>& x, const vector<T,Allocator>& y)
{
greater_equal<typename iterator_traits<typename vector<T,Allocator>::iterator >::value_type> c;
- return lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), c);
+ return lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), c);
}
template <class T, class Allocator> _UCXXEXPORT bool
operator<=(const vector<T,Allocator>& x, const vector<T,Allocator>& y)
{
less_equal<typename iterator_traits<typename vector<T,Allocator>::iterator >::value_type> c;
- return lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), c);
+ return lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), c);
}
template <class T, class Allocator> _UCXXEXPORT void swap(vector<T,Allocator>& x, vector<T,Allocator>& y){
More information about the uClibc-cvs
mailing list