generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed 7 (of 8) different 'iterators.h' files in test/localization

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@171443 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2013-01-03 01:45:09 +00:00
parent 159b9ba4ce
commit 002a984948
66 changed files with 85 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h → test/localization/iterators.h
View File

@ -3,6 +3,33 @@
#include <iterator>
template <class It>
class output_iterator
{
It it_;
template <class U> friend class output_iterator;
public:
typedef std::output_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
output_iterator () {}
explicit output_iterator(It it) : it_(it) {}
template <class U>
output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
output_iterator& operator++() {++it_; return *this;}
output_iterator operator++(int)
{output_iterator tmp(*this); ++(*this); return tmp;}
};
template <class It>
class input_iterator
{

2
test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

55
test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/iterators.h
View File

@ -1,55 +0,0 @@
#ifndef ITERATORS_H
#define ITERATORS_H
#include <iterator>
template <class It>
class input_iterator
{
It it_;
template <class U> friend class input_iterator;
public:
typedef std::input_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
input_iterator() : it_() {}
explicit input_iterator(It it) : it_(it) {}
template <class U>
input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
pointer operator->() const {return it_;}
input_iterator& operator++() {++it_; return *this;}
input_iterator operator++(int)
{input_iterator tmp(*this); ++(*this); return tmp;}
friend bool operator==(const input_iterator& x, const input_iterator& y)
{return x.it_ == y.it_;}
friend bool operator!=(const input_iterator& x, const input_iterator& y)
{return !(x == y);}
};
template <class T, class U>
inline
bool
operator==(const input_iterator<T>& x, const input_iterator<U>& y)
{
return x.base() == y.base();
}
template <class T, class U>
inline
bool
operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
{
return !(x == y);
}
#endif // ITERATORS_H

33
test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/iterators.h
View File

@ -1,33 +0,0 @@
#ifndef ITERATORS_H
#define ITERATORS_H
#include <iterator>
template <class It>
class output_iterator
{
It it_;
template <class U> friend class output_iterator;
public:
typedef std::output_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
output_iterator() : it_() {}
explicit output_iterator(It it) : it_(it) {}
template <class U>
output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
output_iterator& operator++() {++it_; return *this;}
output_iterator operator++(int)
{output_iterator tmp(*this); ++(*this); return tmp;}
};
#endif // ITERATORS_H

2
test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros

33
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/iterators.h
View File

@ -1,33 +0,0 @@
#ifndef ITERATORS_H
#define ITERATORS_H
#include <iterator>
template <class It>
class output_iterator
{
It it_;
template <class U> friend class output_iterator;
public:
typedef std::output_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
output_iterator() : it_() {}
explicit output_iterator(It it) : it_(it) {}
template <class U>
output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
output_iterator& operator++() {++it_; return *this;}
output_iterator operator++(int)
{output_iterator tmp(*this); ++(*this); return tmp;}
};
#endif // ITERATORS_H

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
View File

@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
View File

@ -18,7 +18,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
View File

@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
View File

@ -18,7 +18,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
View File

@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
View File

@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
View File

@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
View File

@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
View File

@ -19,7 +19,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../hexfloat.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
View File

@ -19,7 +19,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../hexfloat.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
View File

@ -19,7 +19,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
#include "iterators.h"
#include "../../../../iterators.h"
#include "../../../../../hexfloat.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
View File

@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
View File

@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
View File

@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
View File

@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
View File

@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
View File

@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

2
test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
View File

@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

55
test/localization/locale.categories/category.time/locale.time.get.byname/iterators.h
View File

@ -1,55 +0,0 @@
#ifndef ITERATORS_H
#define ITERATORS_H
#include <iterator>
template <class It>
class input_iterator
{
It it_;
template <class U> friend class input_iterator;
public:
typedef std::input_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
input_iterator() : it_() {}
explicit input_iterator(It it) : it_(it) {}
template <class U>
input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
pointer operator->() const {return it_;}
input_iterator& operator++() {++it_; return *this;}
input_iterator operator++(int)
{input_iterator tmp(*this); ++(*this); return tmp;}
friend bool operator==(const input_iterator& x, const input_iterator& y)
{return x.it_ == y.it_;}
friend bool operator!=(const input_iterator& x, const input_iterator& y)
{return !(x == y);}
};
template <class T, class U>
inline
bool
operator==(const input_iterator<T>& x, const input_iterator<U>& y)
{
return x.base() == y.base();
}
template <class T, class U>
inline
bool
operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
{
return !(x == y);
}
#endif // ITERATORS_H

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
View File

@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::time_get<char, input_iterator<const char*> > F;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const char*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const char*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const char*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
View File

@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const char*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const char*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const char*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
View File

@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;

2
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
View File

@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef input_iterator<const char*> I;

55
test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/iterators.h
View File

@ -1,55 +0,0 @@
#ifndef ITERATORS_H
#define ITERATORS_H
#include <iterator>
template <class It>
class input_iterator
{
It it_;
template <class U> friend class input_iterator;
public:
typedef std::input_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
input_iterator() : it_() {}
explicit input_iterator(It it) : it_(it) {}
template <class U>
input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
pointer operator->() const {return it_;}
input_iterator& operator++() {++it_; return *this;}
input_iterator operator++(int)
{input_iterator tmp(*this); ++(*this); return tmp;}
friend bool operator==(const input_iterator& x, const input_iterator& y)
{return x.it_ == y.it_;}
friend bool operator!=(const input_iterator& x, const input_iterator& y)
{return !(x == y);}
};
template <class T, class U>
inline
bool
operator==(const input_iterator<T>& x, const input_iterator<U>& y)
{
return x.base() == y.base();
}
template <class T, class U>
inline
bool
operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
{
return !(x == y);
}
#endif // ITERATORS_H

33
test/localization/locale.categories/category.time/locale.time.put.byname/iterators.h
View File

@ -1,33 +0,0 @@
#ifndef ITERATORS_H
#define ITERATORS_H
#include <iterator>
template <class It>
class output_iterator
{
It it_;
template <class U> friend class output_iterator;
public:
typedef std::output_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
output_iterator() : it_() {}
explicit output_iterator(It it) : it_(it) {}
template <class U>
output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
output_iterator& operator++() {++it_; return *this;}
output_iterator operator++(int)
{output_iterator tmp(*this); ++(*this); return tmp;}
};
#endif // ITERATORS_H

2
test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
View File

@ -23,7 +23,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros

33
test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/iterators.h
View File

@ -1,33 +0,0 @@
#ifndef ITERATORS_H
#define ITERATORS_H
#include <iterator>
template <class It>
class output_iterator
{
It it_;
template <class U> friend class output_iterator;
public:
typedef std::output_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
output_iterator() : it_() {}
explicit output_iterator(It it) : it_(it) {}
template <class U>
output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
output_iterator& operator++() {++it_; return *this;}
output_iterator operator++(int)
{output_iterator tmp(*this); ++(*this); return tmp;}
};
#endif // ITERATORS_H

2
test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
View File

@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::time_put<char, output_iterator<char*> > F;

2
test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
View File

@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
#include "iterators.h"
#include "../../../../iterators.h"
typedef std::time_put<char, output_iterator<char*> > F;