diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 08fdfa369ed72c573d6ab4ad5974847f6cad5c4c..4a0bcdd62cfef8fc6448fc1adc681e969f781a25 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,55 @@
+2010-11-16 Benjamin Kosnik <bkoz@redhat.com>
+
+ * testsuite/util/testsuite_iterators.h: Guard move.h includes.
+ * testsuite/util/testsuite_allocator.h: Same.
+
+ * testsuite/20_util/temporary_buffer.cc: Use typedef, qualify.
+
+ * testsuite/ext/pb_ds/regression/hash_data_map_rand.cc: Define
+ PB_DS_REGRESSION in the source file.
+ * testsuite/ext/pb_ds/regression/trie_data_map_rand.cc: Same.
+ * testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc: Same.
+ * testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc: Same.
+ * testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc: Same.
+ * testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc: Same.
+ * testsuite/ext/pb_ds/regression/priority_queue_rand.cc: Same.
+ * testsuite/ext/pb_ds/regression/tree_data_map_rand.cc: Same.
+ * testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc: Same.
+
+ * testsuite/21_strings/c_strings/wchar_t/3_neg.cc: Move to this.
+ Use _neg suffix.
+ * testsuite/21_strings/c_strings/wchar_t/3.cc: ...from this.
+ * testsuite/21_strings/c_strings/char/3_neg.cc: Same.
+ * testsuite/21_strings/c_strings/char/3.cc: Same.
+ * testsuite/ext/slist/23781_neg.cc: Same.
+ * testsuite/ext/slist/23781.cc: Same.
+ * testsuite/ext/profile/mutex_extensions.cc: Same.
+ * testsuite/ext/profile/mutex_extensions_neg.cc: Same.
+ * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820.cc: Same.
+ * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
+ * testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc:
+ Same.
+ * testsuite/tr1/6_containers/tuple/comparison_operators/35480.cc: Same.
+ * testsuite/23_containers/multimap/23781_neg.cc: Same.
+ * testsuite/23_containers/multimap/23781.cc: Same.
+ * testsuite/23_containers/set/23781_neg.cc: Same.
+ * testsuite/23_containers/set/23781.cc: Same.
+ * testsuite/23_containers/multiset/23781_neg.cc: Same.
+ * testsuite/23_containers/multiset/23781.cc: Same.
+ * testsuite/23_containers/list/23781_neg.cc: Same.
+ * testsuite/23_containers/list/23781.cc: Same.
+ * testsuite/23_containers/map/23781_neg.cc: Same.
+ * testsuite/23_containers/map/23781.cc: Same.
+ * testsuite/20_util/duration/cons/dr974_neg.cc: Same.
+ * testsuite/20_util/duration/cons/dr974.cc: Same.
+ * testsuite/20_util/tuple/comparison_operators/35480_neg.cc: Same.
+ * testsuite/20_util/tuple/comparison_operators/35480.cc: Same.
+ * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
+ * testsuite/20_util/shared_ptr/cons/43820.cc: Same.
+ * testsuite/20_util/unique_ptr/cons/pointer_array_convertible_neg.cc:
+ Same.
+ * testsuite/20_util/unique_ptr/cons/pointer_array_convertible.cc: Same.
+
2010-12-15 Paolo Carlini <paolo.carlini@oracle.com>
* include/ext/vstring.h (operator+(__versa_string<>&&,
diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/dr974.cc b/libstdc++-v3/testsuite/20_util/duration/cons/dr974_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/20_util/duration/cons/dr974.cc
rename to libstdc++-v3/testsuite/20_util/duration/cons/dr974_neg.cc
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820.cc
rename to libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc
diff --git a/libstdc++-v3/testsuite/20_util/temporary_buffer.cc b/libstdc++-v3/testsuite/20_util/temporary_buffer.cc
index 7266f9e2da23082da09029f02b40aa364bd0a517..b6e3d448a950b038e39a7aae8d4d4d147218cc5b 100644
--- a/libstdc++-v3/testsuite/20_util/temporary_buffer.cc
+++ b/libstdc++-v3/testsuite/20_util/temporary_buffer.cc
@@ -28,7 +28,8 @@ int main(void)
{
bool test __attribute__((unused)) = true;
- std::pair<junk*,ptrdiff_t> results = std::get_temporary_buffer<junk>(5);
+ typedef std::pair<junk*, std::ptrdiff_t> pair_type;
+ pair_type results = std::get_temporary_buffer<junk>(5);
if (results.second != 0)
{
diff --git a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480.cc b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480.cc
rename to libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480_neg.cc
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array_convertible.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array_convertible_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array_convertible.cc
rename to libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array_convertible_neg.cc
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc b/libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc
rename to libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc
rename to libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc
diff --git a/libstdc++-v3/testsuite/23_containers/list/23781.cc b/libstdc++-v3/testsuite/23_containers/list/23781_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/list/23781.cc
rename to libstdc++-v3/testsuite/23_containers/list/23781_neg.cc
diff --git a/libstdc++-v3/testsuite/23_containers/map/23781.cc b/libstdc++-v3/testsuite/23_containers/map/23781_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/map/23781.cc
rename to libstdc++-v3/testsuite/23_containers/map/23781_neg.cc
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/23781.cc b/libstdc++-v3/testsuite/23_containers/multimap/23781_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/multimap/23781.cc
rename to libstdc++-v3/testsuite/23_containers/multimap/23781_neg.cc
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/23781.cc b/libstdc++-v3/testsuite/23_containers/multiset/23781_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/multiset/23781.cc
rename to libstdc++-v3/testsuite/23_containers/multiset/23781_neg.cc
diff --git a/libstdc++-v3/testsuite/23_containers/set/23781.cc b/libstdc++-v3/testsuite/23_containers/set/23781_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/set/23781.cc
rename to libstdc++-v3/testsuite/23_containers/set/23781_neg.cc
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
index bdbeb80671605122ce0603776995bc2da4e7f3db..4e48bd85fd64dedde9d90f52376b1419b97eb415 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
@@ -1,4 +1,8 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+// This can take long on simulators, timing out the test.
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-timeout-factor 2.0 }
+
// -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp>
-// This can take long on simulators, timing out the test.
-// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
-// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS
#define ITERATIONS 5000
#endif
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
index 20908404f6a24754708a9da4936b0ba3815f5111..ef4352716a6fc1eee5f7140e47e32e74fbf019f2 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
@@ -1,4 +1,8 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+// This can take long on simulators, timing out the test.
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-timeout-factor 2.0 }
+
// -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp>
-// This can take long on simulators, timing out the test.
-// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
-// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS
#define ITERATIONS 5000
#endif
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
index b9761b9ad3282222efc87c1abbdc5ebf06faf26c..8bd77816c0225beba1cd7d13b7a79bcf0862954a 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
@@ -1,4 +1,5 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+
// -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
@@ -35,7 +36,7 @@
* Contains a random-operation test for maps and sets.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp>
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
index dea56152127b295c9ee96b7dd308d984fb9a9a64..72273a8bc3725fc2612dbffc9d801e5797f2ba36 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
@@ -1,4 +1,5 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+
// -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
@@ -35,7 +36,7 @@
* Contains a random-operation test for maps and sets.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp>
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
index c8ec66ce366667f567d9a5c683356c9ad00da971..b21f486d6d7e07bb7ffb9d5525cbfa1354e10cc3 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
@@ -1,4 +1,8 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+// This can take long on simulators, timing out the test.
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-timeout-factor 2.0 }
+
// -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
@@ -35,14 +39,11 @@
* Contains a random-operation test for priority queues.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/priority_queue/rand_regression_test.hpp>
#include <regression/common_type.hpp>
-// This can take long on simulators, timing out the test.
-// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
-// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS
#define ITERATIONS 5000
#endif
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
index 81b46fe6362086369b7a3d5a5407c102ac200f59..8d5869a20477b6cb20d658a78310b87f72f3ad0d 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
@@ -1,4 +1,8 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+// This can take long on simulators, timing out the test.
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-timeout-factor 2.0 }
+
// -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp>
-// This can take long on simulators, timing out the test.
-// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
-// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS
#define ITERATIONS 5000
#endif
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
index 7e3cbedbecc95ff2d3166757f0fbb8108ff4f21e..8af31e0a265df024ba2ede906cecf60b9a1c3267 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
@@ -1,4 +1,8 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+// This can take long on simulators, timing out the test.
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-timeout-factor 2.0 }
+
// -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp>
-// This can take long on simulators, timing out the test.
-// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
-// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS
#define ITERATIONS 5000
#endif
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
index 64fcb665f4263e1a0053ddae5c169a75c1dc93f9..26f4325c62ed2031e8f2ca79da322a920f0fb065 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
@@ -1,4 +1,8 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+// This can take long on simulators, timing out the test.
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-timeout-factor 2.0 }
+
// -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp>
-// This can take long on simulators, timing out the test.
-// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
-// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS
#define ITERATIONS 5000
#endif
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
index 714b43730a0d2accd93d491dd347ba26ef1edf47..a0e1b5f281a0e5ef34b7055e57a1b974d105f909 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
@@ -1,7 +1,11 @@
-// { dg-options "-DPB_DS_REGRESSION" }
+// { dg-require-time "" }
+// This can take long on simulators, timing out the test.
+// { dg-options "-DITERATIONS=5" { target simulator } }
+// { dg-timeout-factor 2.0 }
+
// -*- C++ -*-
-// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the terms
@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets.
*/
-// { dg-require-time "" }
+#define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp>
-// This can take long on simulators, timing out the test.
-// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
-// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS
#define ITERATIONS 5000
#endif
diff --git a/libstdc++-v3/testsuite/ext/profile/mutex_extensions.cc b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/ext/profile/mutex_extensions.cc
rename to libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
diff --git a/libstdc++-v3/testsuite/ext/slist/23781.cc b/libstdc++-v3/testsuite/ext/slist/23781_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/ext/slist/23781.cc
rename to libstdc++-v3/testsuite/ext/slist/23781_neg.cc
diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/43820.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/43820.cc
rename to libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc
similarity index 100%
rename from libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480.cc
rename to libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc
diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h
index cb481b2a7f93c1d02891b6c9747b25a27d310f69..a534d85845d59b590460049203e5153c66d49891 100644
--- a/libstdc++-v3/testsuite/util/testsuite_allocator.h
+++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h
@@ -29,7 +29,10 @@
#include <tr1/unordered_map>
#include <cassert>
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
#include <bits/move.h>
+#endif
namespace __gnu_test
{
diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h
index e7a068d208d32502070eb4511e3dfe43666f797b..d815b6c570fc341814bb5efca3fbd16727972700 100644
--- a/libstdc++-v3/testsuite/util/testsuite_iterators.h
+++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h
@@ -30,7 +30,10 @@
#include <testsuite_hooks.h>
#include <bits/stl_iterator_base_types.h>
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
#include <bits/move.h>
+#endif
#ifndef _TESTSUITE_ITERATORS
#define _TESTSUITE_ITERATORS