[cfe-commits] [libcxx] r171443 - in /libcxx/trunk/test/localization: ./ locale.categories/category.monetary/locale.money.get/locale.money.get.members/ locale.categories/category.monetary/locale.money.put/locale.money.put.members/ locale.categories/category.numeric/locale.nm.put/facet.num.put.members/ locale.categories/category.numeric/locale.num.get/facet.num.get.members/ locale.categories/category.time/locale.time.get.byname/ locale.categories/category.time/locale.time.get/locale.time.get.members/ locale.categories/c...
Marshall Clow
mclow at qualcomm.com
Wed Jan 2 17:45:10 PST 2013
Author: marshall
Date: Wed Jan 2 19:45:09 2013
New Revision: 171443
URL: http://llvm.org/viewvc/llvm-project?rev=171443&view=rev
Log:
Removed 7 (of 8) different 'iterators.h' files in test/localization
Added:
libcxx/trunk/test/localization/iterators.h
- copied, changed from r171436, libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h
Removed:
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/iterators.h
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/iterators.h
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/iterators.h
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/iterators.h
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/iterators.h
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/iterators.h
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/iterators.h
Modified:
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
Copied: libcxx/trunk/test/localization/iterators.h (from r171436, libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h)
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/iterators.h?p2=libcxx/trunk/test/localization/iterators.h&p1=libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h&r1=171436&r2=171443&rev=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h (original)
+++ libcxx/trunk/test/localization/iterators.h Wed Jan 2 19:45:09 2013
@@ -4,6 +4,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
{
It it_;
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Removed: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/iterators.h?rev=171442&view=auto
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/iterators.h (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/iterators.h (removed)
@@ -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
Removed: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/iterators.h?rev=171442&view=auto
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/iterators.h (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/iterators.h (removed)
@@ -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
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp Wed Jan 2 19:45:09 2013
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
Removed: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/iterators.h?rev=171442&view=auto
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/iterators.h (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/iterators.h (removed)
@@ -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
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Modified: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp Wed Jan 2 19:45:09 2013
@@ -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;
Removed: libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h?rev=171442&view=auto
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h (original)
+++ libcxx/trunk/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/iterators.h (removed)
@@ -1,251 +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);
-}
-
-template <class It>
-class forward_iterator
-{
- It it_;
-
- template <class U> friend class forward_iterator;
-public:
- typedef std::forward_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_;}
-
- forward_iterator() : it_() {}
- explicit forward_iterator(It it) : it_(it) {}
- template <class U>
- forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- forward_iterator& operator++() {++it_; return *this;}
- forward_iterator operator++(int)
- {forward_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const forward_iterator& x, const forward_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const forward_iterator& x, const forward_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class bidirectional_iterator
-{
- It it_;
-
- template <class U> friend class bidirectional_iterator;
-public:
- typedef std::bidirectional_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_;}
-
- bidirectional_iterator() : it_() {}
- explicit bidirectional_iterator(It it) : it_(it) {}
- template <class U>
- bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- bidirectional_iterator& operator++() {++it_; return *this;}
- bidirectional_iterator operator++(int)
- {bidirectional_iterator tmp(*this); ++(*this); return tmp;}
-
- bidirectional_iterator& operator--() {--it_; return *this;}
- bidirectional_iterator operator--(int)
- {bidirectional_iterator tmp(*this); --(*this); return tmp;}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class random_access_iterator
-{
- It it_;
-
- template <class U> friend class random_access_iterator;
-public:
- typedef std::random_access_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_;}
-
- random_access_iterator() : it_() {}
- explicit random_access_iterator(It it) : it_(it) {}
- template <class U>
- random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- random_access_iterator& operator++() {++it_; return *this;}
- random_access_iterator operator++(int)
- {random_access_iterator tmp(*this); ++(*this); return tmp;}
-
- random_access_iterator& operator--() {--it_; return *this;}
- random_access_iterator operator--(int)
- {random_access_iterator tmp(*this); --(*this); return tmp;}
-
- random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;}
- random_access_iterator operator+(difference_type n) const
- {random_access_iterator tmp(*this); tmp += n; return tmp;}
- friend random_access_iterator operator+(difference_type n, random_access_iterator x)
- {x += n; return x;}
- random_access_iterator& operator-=(difference_type n) {return *this += -n;}
- random_access_iterator operator-(difference_type n) const
- {random_access_iterator tmp(*this); tmp -= n; return tmp;}
-
- reference operator[](difference_type n) const {return it_[n];}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class T, class U>
-inline
-bool
-operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() < y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(y < x);
-}
-
-template <class T, class U>
-inline
-bool
-operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return y < x;
-}
-
-template <class T, class U>
-inline
-bool
-operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x < y);
-}
-
-template <class T, class U>
-inline
-typename std::iterator_traits<T>::difference_type
-operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() - y.base();
-}
-
-#endif // ITERATORS_H
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp Wed Jan 2 19:45:09 2013
@@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp Wed Jan 2 19:45:09 2013
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp Wed Jan 2 19:45:09 2013
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Removed: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/iterators.h?rev=171442&view=auto
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/iterators.h (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get.byname/iterators.h (removed)
@@ -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
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp Wed Jan 2 19:45:09 2013
@@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef std::time_get<char, input_iterator<const char*> > F;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const char*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const char*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const char*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp Wed Jan 2 19:45:09 2013
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const char*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const char*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const char*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp Wed Jan 2 19:45:09 2013
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp Wed Jan 2 19:45:09 2013
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef input_iterator<const char*> I;
Removed: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/iterators.h?rev=171442&view=auto
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/iterators.h (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/iterators.h (removed)
@@ -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
Removed: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/iterators.h?rev=171442&view=auto
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/iterators.h (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/iterators.h (removed)
@@ -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
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp Wed Jan 2 19:45:09 2013
@@ -23,7 +23,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
Removed: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/iterators.h?rev=171442&view=auto
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/iterators.h (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/iterators.h (removed)
@@ -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
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp Wed Jan 2 19:45:09 2013
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef std::time_put<char, output_iterator<char*> > F;
Modified: libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp?rev=171443&r1=171442&r2=171443&view=diff
==============================================================================
--- libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp (original)
+++ libcxx/trunk/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp Wed Jan 2 19:45:09 2013
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "iterators.h"
+#include "../../../../iterators.h"
typedef std::time_put<char, output_iterator<char*> > F;
More information about the cfe-commits
mailing list