Fixing whitespace problems

llvm-svn: 111755

63 files changed, 318 insertions, 318 deletions

diff --git a/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp b/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp
index 80e9390f4ce..ade5b9bf816 100644
--- a/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp
@@ -34,5 +34,5 @@ int main()
     m[6] = 6.5;
     assert(m[6] == 6.5);
     assert(m.size() == 2);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp b/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp
index d5f1d04ea62..4de0889f6b0 100644
--- a/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp
@@ -15,12 +15,12 @@
 // const_iterator begin() const;
 //       iterator end();
 // const_iterator end()   const;
-// 
+//
 //       reverse_iterator rbegin();
 // const_reverse_iterator rbegin() const;
 //       reverse_iterator rend();
 // const_reverse_iterator rend()   const;
-// 
+//
 // const_iterator         cbegin()  const;
 // const_iterator         cend()    const;
 // const_reverse_iterator crbegin() const;
diff --git a/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
index 1673c54caf4..3a5ffa73dde 100644
--- a/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
@@ -24,7 +24,7 @@ int main()
                             {
                                 {20, 1},
                             };
-    m = 
+    m =
                             {
                                 {1, 1},
                                 {1, 1.5},
@@ -41,5 +41,5 @@ int main()
     assert(*m.begin() == V(1, 1));
     assert(*next(m.begin()) == V(2, 1));
     assert(*next(m.begin(), 2) == V(3, 1));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
index d1f92888527..6975d6073f7 100644
--- a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
@@ -46,7 +46,7 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -81,7 +81,7 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -90,5 +90,5 @@ int main()
         assert(*next(mo.begin()) == V(2, 1));
         assert(*next(mo.begin(), 2) == V(3, 1));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
index 945125c980b..3f98368d431 100644
--- a/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
@@ -47,7 +47,7 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -82,7 +82,7 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp
index e56bf8496be..02ae034a1d5 100644
--- a/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp
@@ -37,5 +37,5 @@ int main()
     assert(*m.begin() == V(1, 1));
     assert(*next(m.begin()) == V(2, 1));
     assert(*next(m.begin(), 2) == V(3, 1));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
index dba0cdcd442..d47fb41ab2a 100644
--- a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
@@ -39,5 +39,5 @@ int main()
     assert(*next(m.begin()) == V(2, 1));
     assert(*next(m.begin(), 2) == V(3, 1));
     assert(m.key_comp() == C(3));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
index fafc80d0b4b..221b2518582 100644
--- a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
@@ -42,5 +42,5 @@ int main()
     assert(*next(m.begin(), 2) == V(3, 1));
     assert(m.key_comp() == C(3));
     assert(m.get_allocator() == A(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
index 22a164cc2ba..a36bba4eb09 100644
--- a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
@@ -32,7 +32,7 @@ int main()
         assert(m.key_comp() == C(5));
         assert(m.size() == 0);
         assert(distance(m.begin(), m.end()) == 0);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
@@ -62,11 +62,11 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
index c235bc01c74..4ecc434a6dc 100644
--- a/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
@@ -140,5 +140,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
index 423f30a2ed4..498c4fa4a9d 100644
--- a/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
@@ -143,5 +143,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp
index 0535047af7a..258b87f0cee 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp
@@ -85,5 +85,5 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
index 6311b883d11..d4e3676d41a 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
@@ -78,5 +78,5 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
index 39cbbe6d068..ec1b80b3032 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
@@ -39,5 +39,5 @@ int main()
     assert(*m.begin() == V(1, 1));
     assert(*next(m.begin()) == V(2, 1));
     assert(*next(m.begin(), 2) == V(3, 1));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
index 15753d7ebc4..6e066c5b414 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
@@ -51,5 +51,5 @@ int main()
         assert(r->first == 3);
         assert(r->second == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
index 077d2834391..b4a4ee0bf54 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
@@ -54,5 +54,5 @@ int main()
         assert(r.first->first == 3);
         assert(r.first->second == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/iterator.pass.cpp b/libcxx/test/containers/associative/multimap/iterator.pass.cpp
index a81c3f59de0..c6844d9c877 100644
--- a/libcxx/test/containers/associative/multimap/iterator.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/iterator.pass.cpp
@@ -15,12 +15,12 @@
 // const_iterator begin() const;
 //       iterator end();
 // const_iterator end()   const;
-// 
+//
 //       reverse_iterator rbegin();
 // const_reverse_iterator rbegin() const;
 //       reverse_iterator rend();
 // const_reverse_iterator rend()   const;
-// 
+//
 // const_iterator         cbegin()  const;
 // const_iterator         cend()    const;
 // const_reverse_iterator crbegin() const;
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
index 209148cfc17..948c689f43d 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
@@ -22,7 +22,7 @@ int main()
     typedef std::multimap<int, double> C;
     typedef C::value_type V;
     C m = {{20, 1}};
-    m = 
+    m =
            {
                {1, 1},
                {1, 1.5},
@@ -46,5 +46,5 @@ int main()
     assert(*++i == V(3, 1));
     assert(*++i == V(3, 1.5));
     assert(*++i == V(3, 2));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
index 531ef93e101..f1b743be257 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
@@ -42,7 +42,7 @@ int main()
         assert(m == mo);
         assert(m.get_allocator() == A(7));
         assert(m.key_comp() == C(5));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
     }
@@ -68,9 +68,9 @@ int main()
         assert(m == mo);
         assert(m.get_allocator() == A(-2));
         assert(m.key_comp() == C(5));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
index 57d0ef3d056..158accca8a5 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
@@ -43,7 +43,7 @@ int main()
         assert(m == mo);
         assert(m.get_allocator() == A(7));
         assert(m.key_comp() == C(5));
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
     }
@@ -69,7 +69,7 @@ int main()
         assert(m == mo);
         assert(m.get_allocator() == A(2));
         assert(m.key_comp() == C(5));
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
     }
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
index e24e6018b44..862487bdadb 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
@@ -45,5 +45,5 @@ int main()
     assert(*++i == V(3, 1));
     assert(*++i == V(3, 1.5));
     assert(*++i == V(3, 2));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
index 0cb785bc473..542697f2ccf 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
@@ -50,5 +50,5 @@ int main()
     assert(*++i == V(3, 1.5));
     assert(*++i == V(3, 2));
     assert(m.key_comp() == Cmp(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
index 681936b5759..24bf9758c17 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
@@ -53,5 +53,5 @@ int main()
     assert(*++i == V(3, 2));
     assert(m.key_comp() == Cmp(4));
     assert(m.get_allocator() == A(5));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
index 1c6109f4849..3272212e265 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
@@ -32,7 +32,7 @@ int main()
         assert(m.key_comp() == C(5));
         assert(m.size() == 0);
         assert(distance(m.begin(), m.end()) == 0);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
@@ -68,11 +68,11 @@ int main()
         assert(*next(m.begin(), 6) == V(3, 1));
         assert(*next(m.begin(), 7) == V(3, 1.5));
         assert(*next(m.begin(), 8) == V(3, 2));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
index a1321ae3117..b22debaba4d 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
@@ -140,5 +140,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
index c6a1f668932..a7dccd3ff21 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
@@ -143,5 +143,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
index ea85371d913..811f1bf268a 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
@@ -78,5 +78,5 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
index 98630dbd964..c7d5895a3fa 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
@@ -78,5 +78,5 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
index 2cd52583000..93aab71aed1 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
@@ -49,5 +49,5 @@ int main()
     assert(*++i == V(3, 1));
     assert(*++i == V(3, 2));
     assert(*++i == V(3, 1.5));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
index eb89b136f55..311ce01c293 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
@@ -51,5 +51,5 @@ int main()
         assert(r->first == 3);
         assert(r->second == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
index b9463c431f4..5b39998d344 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
@@ -50,5 +50,5 @@ int main()
         assert(r->first == 3);
         assert(r->second == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/emplace.pass.cpp b/libcxx/test/containers/associative/multiset/emplace.pass.cpp
index 30a23b020fd..df2d6569050 100644
--- a/libcxx/test/containers/associative/multiset/emplace.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/emplace.pass.cpp
@@ -67,5 +67,5 @@ int main()
         assert(m.size() == 1);
         assert(*r == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp b/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp
index 84442261c45..44806984ce4 100644
--- a/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp
@@ -67,5 +67,5 @@ int main()
         assert(m.size() == 1);
         assert(*r == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
index d723811f276..b7c1f2d559b 100644
--- a/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
@@ -34,5 +34,5 @@ int main()
     assert(*++i == V(6));
     assert(*++i == V(8));
     assert(*++i == V(10));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp
index 61ac19144f0..dde5c002edb 100644
--- a/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(m.size() == 4);
         assert(*r == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp
index ca66aaff8f2..19e61191b2e 100644
--- a/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(m.size() == 4);
         assert(*r == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/iterator.pass.cpp b/libcxx/test/containers/associative/multiset/iterator.pass.cpp
index 54c41ef4ccb..154d94a41a4 100644
--- a/libcxx/test/containers/associative/multiset/iterator.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/iterator.pass.cpp
@@ -15,12 +15,12 @@
 // const_iterator begin() const;
 //       iterator end();
 // const_iterator end()   const;
-// 
+//
 //       reverse_iterator rbegin();
 // const_reverse_iterator rbegin() const;
 //       reverse_iterator rend();
 // const_reverse_iterator rend()   const;
-// 
+//
 // const_iterator         cbegin()  const;
 // const_iterator         cend()    const;
 // const_reverse_iterator crbegin() const;
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
index 803c245a5a2..2420126eb29 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
@@ -32,5 +32,5 @@ int main()
     assert(*++i == V(4));
     assert(*++i == V(5));
     assert(*++i == V(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
index f9e5e418c04..86be5e71eb7 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
@@ -52,7 +52,7 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 9);
@@ -99,7 +99,7 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 9);
@@ -114,5 +114,5 @@ int main()
         assert(*next(mo.begin(), 7) == 3);
         assert(*next(mo.begin(), 8) == 3);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
index 2016ca39ba7..5d1f422ece5 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
@@ -53,7 +53,7 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 9);
@@ -100,7 +100,7 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 9);
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
index 70817cb9357..9f51ad6fc37 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
@@ -31,5 +31,5 @@ int main()
     assert(*++i == V(4));
     assert(*++i == V(5));
     assert(*++i == V(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
index 363af541887..b737d278b40 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
@@ -34,5 +34,5 @@ int main()
     assert(*++i == V(5));
     assert(*++i == V(6));
     assert(m.key_comp() == Cmp(10));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
index 467441d15a5..b85179374ba 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
@@ -37,5 +37,5 @@ int main()
     assert(*++i == V(6));
     assert(m.key_comp() == Cmp(10));
     assert(m.get_allocator() == A(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
index 3393bc66bfc..e392733c906 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
@@ -32,7 +32,7 @@ int main()
         assert(m.key_comp() == C(5));
         assert(m.size() == 0);
         assert(distance(m.begin(), m.end()) == 0);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
@@ -69,11 +69,11 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
index 6e34f37170e..9043047ef22 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
@@ -137,5 +137,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
index 93efddbd7e5..778a11397ba 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
@@ -140,5 +140,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/emplace.pass.cpp b/libcxx/test/containers/associative/set/emplace.pass.cpp
index f29a93b0de6..2082d5410d0 100644
--- a/libcxx/test/containers/associative/set/emplace.pass.cpp
+++ b/libcxx/test/containers/associative/set/emplace.pass.cpp
@@ -73,5 +73,5 @@ int main()
         assert(m.size() == 1);
         assert(*r.first == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/emplace_hint.pass.cpp b/libcxx/test/containers/associative/set/emplace_hint.pass.cpp
index d17603a8844..faa7e1d7d72 100644
--- a/libcxx/test/containers/associative/set/emplace_hint.pass.cpp
+++ b/libcxx/test/containers/associative/set/emplace_hint.pass.cpp
@@ -67,5 +67,5 @@ int main()
         assert(m.size() == 1);
         assert(*r == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp
index 2d403d9d83e..5cc6a694116 100644
--- a/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp
@@ -34,5 +34,5 @@ int main()
     assert(*++i == V(6));
     assert(*++i == V(8));
     assert(*++i == V(10));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp
index 8231bbbfcff..16161787a6f 100644
--- a/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(m.size() == 3);
         assert(*r == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/insert_rv.pass.cpp b/libcxx/test/containers/associative/set/insert_rv.pass.cpp
index b77307861f0..d4fa699aacd 100644
--- a/libcxx/test/containers/associative/set/insert_rv.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_rv.pass.cpp
@@ -49,5 +49,5 @@ int main()
         assert(m.size() == 3);
         assert(*r.first == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/iterator.pass.cpp b/libcxx/test/containers/associative/set/iterator.pass.cpp
index e6627fb3d94..2f5bc53b8f3 100644
--- a/libcxx/test/containers/associative/set/iterator.pass.cpp
+++ b/libcxx/test/containers/associative/set/iterator.pass.cpp
@@ -15,12 +15,12 @@
 // const_iterator begin() const;
 //       iterator end();
 // const_iterator end()   const;
-// 
+//
 //       reverse_iterator rbegin();
 // const_reverse_iterator rbegin() const;
 //       reverse_iterator rend();
 // const_reverse_iterator rend()   const;
-// 
+//
 // const_iterator         cbegin()  const;
 // const_iterator         cend()    const;
 // const_reverse_iterator crbegin() const;
diff --git a/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
index aba35be520a..49c9b843f41 100644
--- a/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
@@ -32,5 +32,5 @@ int main()
     assert(*++i == V(4));
     assert(*++i == V(5));
     assert(*++i == V(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp b/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp
index 01972cdaf79..5602e6e56c2 100644
--- a/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp
@@ -46,7 +46,7 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -81,7 +81,7 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -90,5 +90,5 @@ int main()
         assert(*next(mo.begin()) == 2);
         assert(*next(mo.begin(), 2) == 3);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
index 34a9f69e4f0..71c433f8c4b 100644
--- a/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
@@ -47,7 +47,7 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -82,7 +82,7 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
diff --git a/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp
index 333174fcc37..8fef24b18c5 100644
--- a/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp
@@ -31,5 +31,5 @@ int main()
     assert(*++i == V(4));
     assert(*++i == V(5));
     assert(*++i == V(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
index 75eaa208d7e..65f539d322d 100644
--- a/libcxx/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
@@ -34,5 +34,5 @@ int main()
     assert(*++i == V(5));
     assert(*++i == V(6));
     assert(m.key_comp() == Cmp(10));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
index 9e868d6b523..418c551f4a9 100644
--- a/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
@@ -37,5 +37,5 @@ int main()
     assert(*++i == V(6));
     assert(m.key_comp() == Cmp(10));
     assert(m.get_allocator() == A(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
index d5b910e31fe..df46c5d6273 100644
--- a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
@@ -32,7 +32,7 @@ int main()
         assert(m.key_comp() == C(5));
         assert(m.size() == 0);
         assert(distance(m.begin(), m.end()) == 0);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
@@ -63,11 +63,11 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp
index 6f39cddbf59..653c60fcdd7 100644
--- a/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp
@@ -137,5 +137,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
index 3a7433beffc..e2fd21d58c5 100644
--- a/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
@@ -140,5 +140,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/containers/associative/tree_balance_after_insert.pass.cpp b/libcxx/test/containers/associative/tree_balance_after_insert.pass.cpp
index 26d8e277917..bb0861bd39d 100644
--- a/libcxx/test/containers/associative/tree_balance_after_insert.pass.cpp
+++ b/libcxx/test/containers/associative/tree_balance_after_insert.pass.cpp
@@ -36,50 +36,50 @@ test1()
         Node b;
         Node c;
         Node d;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &a;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = 0;
         d.__right_ = 0;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
 
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &a);
         assert(b.__right_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == 0);
         assert(d.__right_ == 0);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -91,50 +91,50 @@ test1()
         Node b;
         Node c;
         Node d;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = 0;
         b.__right_ = &a;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = 0;
         d.__right_ = 0;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == 0);
         assert(b.__right_ == &a);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == 0);
         assert(d.__right_ == 0);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -146,50 +146,50 @@ test1()
         Node b;
         Node c;
         Node d;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = 0;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &a;
         d.__right_ = 0;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &d;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == 0);
         assert(b.__right_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &a);
         assert(d.__right_ == 0);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &d);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -201,50 +201,50 @@ test1()
         Node b;
         Node c;
         Node d;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = 0;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = 0;
         d.__right_ = &a;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &d;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == 0);
         assert(b.__right_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == 0);
         assert(d.__right_ == &a);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &d);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -261,24 +261,24 @@ test1()
         Node g;
         Node h;
         Node i;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &a;
         b.__right_ = &g;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &h;
         d.__right_ = &i;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = &e;
         a.__right_ = &f;
@@ -286,40 +286,40 @@ test1()
 
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &a;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &b;
         g.__is_black_ = true;
-    
+
         h.__parent_ = &d;
         h.__is_black_ = true;
-    
+
         i.__parent_ = &d;
         i.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &a);
         assert(b.__right_ == &g);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &h);
         assert(d.__right_ == &i);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &e);
         assert(a.__right_ == &f);
@@ -336,24 +336,24 @@ test1()
         Node g;
         Node h;
         Node i;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &g;
         b.__right_ = &a;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &h;
         d.__right_ = &i;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = &e;
         a.__right_ = &f;
@@ -361,40 +361,40 @@ test1()
 
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &a;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &b;
         g.__is_black_ = true;
-    
+
         h.__parent_ = &d;
         h.__is_black_ = true;
-    
+
         i.__parent_ = &d;
         i.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &g);
         assert(b.__right_ == &a);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &h);
         assert(d.__right_ == &i);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &e);
         assert(a.__right_ == &f);
@@ -411,24 +411,24 @@ test1()
         Node g;
         Node h;
         Node i;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &g;
         b.__right_ = &h;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &a;
         d.__right_ = &i;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &d;
         a.__left_ = &e;
         a.__right_ = &f;
@@ -436,40 +436,40 @@ test1()
 
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &a;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &b;
         g.__is_black_ = true;
-    
+
         h.__parent_ = &b;
         h.__is_black_ = true;
-    
+
         i.__parent_ = &d;
         i.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &g);
         assert(b.__right_ == &h);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &a);
         assert(d.__right_ == &i);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &d);
         assert(a.__left_ == &e);
         assert(a.__right_ == &f);
@@ -486,24 +486,24 @@ test1()
         Node g;
         Node h;
         Node i;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &g;
         b.__right_ = &h;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &i;
         d.__right_ = &a;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &d;
         a.__left_ = &e;
         a.__right_ = &f;
@@ -511,40 +511,40 @@ test1()
 
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &a;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &b;
         g.__is_black_ = true;
-    
+
         h.__parent_ = &b;
         h.__is_black_ = true;
-    
+
         i.__parent_ = &d;
         i.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &g);
         assert(b.__right_ == &h);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &i);
         assert(d.__right_ == &a);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &d);
         assert(a.__left_ == &e);
         assert(a.__right_ == &f);
@@ -560,35 +560,35 @@ test2()
         Node a;
         Node b;
         Node c;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &a;
         c.__right_ = 0;
         c.__is_black_ = true;
-    
+
         a.__parent_ = &c;
         a.__left_ = 0;
         a.__right_ = &b;
         a.__is_black_ = false;
-    
+
         b.__parent_ = &a;
         b.__left_ = 0;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &b);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -604,30 +604,30 @@ test2()
         Node a;
         Node b;
         Node c;
-    
+
         root.__left_ = &a;
-    
+
         a.__parent_ = &root;
         a.__left_ = 0;
         a.__right_ = &c;
         a.__is_black_ = true;
-    
+
         c.__parent_ = &a;
         c.__left_ = &b;
         c.__right_ = 0;
         c.__is_black_ = false;
-    
+
         b.__parent_ = &c;
         b.__left_ = 0;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &b);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -637,7 +637,7 @@ test2()
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(b.__parent_ == &root);
         assert(b.__left_ == &a);
         assert(b.__right_ == &c);
@@ -652,19 +652,19 @@ test2()
         Node e;
         Node f;
         Node g;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &a;
         c.__right_ = &g;
         c.__is_black_ = true;
-    
+
         a.__parent_ = &c;
         a.__left_ = &d;
         a.__right_ = &b;
         a.__is_black_ = false;
-    
+
         b.__parent_ = &a;
         b.__left_ = &e;
         b.__right_ = &f;
@@ -672,27 +672,27 @@ test2()
 
         d.__parent_ = &a;
         d.__is_black_ = true;
-    
+
         e.__parent_ = &b;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &b;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &c;
         g.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &b);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == &f);
         assert(c.__right_ == &g);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &d);
         assert(a.__right_ == &e);
@@ -724,19 +724,19 @@ test2()
         Node e;
         Node f;
         Node g;
-    
+
         root.__left_ = &a;
-    
+
         a.__parent_ = &root;
         a.__left_ = &d;
         a.__right_ = &c;
         a.__is_black_ = true;
-    
+
         c.__parent_ = &a;
         c.__left_ = &b;
         c.__right_ = &g;
         c.__is_black_ = false;
-    
+
         b.__parent_ = &c;
         b.__left_ = &e;
         b.__right_ = &f;
@@ -744,27 +744,27 @@ test2()
 
         d.__parent_ = &a;
         d.__is_black_ = true;
-    
+
         e.__parent_ = &b;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &b;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &c;
         g.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &b);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == &f);
         assert(c.__right_ == &g);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &d);
         assert(a.__right_ == &e);
@@ -797,35 +797,35 @@ test3()
         Node a;
         Node b;
         Node c;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = 0;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &a;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -841,30 +841,30 @@ test3()
         Node a;
         Node b;
         Node c;
-    
+
         root.__left_ = &a;
-    
+
         a.__parent_ = &root;
         a.__left_ = 0;
         a.__right_ = &b;
         a.__is_black_ = true;
-    
+
         b.__parent_ = &a;
         b.__left_ = 0;
         b.__right_ = &c;
         b.__is_black_ = false;
-    
+
         c.__parent_ = &b;
         c.__left_ = 0;
         c.__right_ = 0;
         c.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &c);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -874,7 +874,7 @@ test3()
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(b.__parent_ == &root);
         assert(b.__left_ == &a);
         assert(b.__right_ == &c);
@@ -889,14 +889,14 @@ test3()
         Node e;
         Node f;
         Node g;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &g;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &a;
         b.__right_ = &f;
@@ -906,30 +906,30 @@ test3()
         a.__left_ = &d;
         a.__right_ = &e;
         a.__is_black_ = false;
-    
+
         d.__parent_ = &a;
         d.__is_black_ = true;
-    
+
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &b;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &c;
         g.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == &f);
         assert(c.__right_ == &g);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &d);
         assert(a.__right_ == &e);
@@ -961,14 +961,14 @@ test3()
         Node e;
         Node f;
         Node g;
-    
+
         root.__left_ = &a;
-    
+
         a.__parent_ = &root;
         a.__left_ = &d;
         a.__right_ = &b;
         a.__is_black_ = true;
-    
+
         b.__parent_ = &a;
         b.__left_ = &e;
         b.__right_ = &c;
@@ -978,30 +978,30 @@ test3()
         c.__left_ = &f;
         c.__right_ = &g;
         c.__is_black_ = false;
-    
+
         d.__parent_ = &a;
         d.__is_black_ = true;
-    
+
         e.__parent_ = &b;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &c;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &c;
         g.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &c);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == &f);
         assert(c.__right_ == &g);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &d);
         assert(a.__right_ == &e);
diff --git a/libcxx/test/containers/associative/tree_remove.pass.cpp b/libcxx/test/containers/associative/tree_remove.pass.cpp
index e942efca1a8..55a068a64a1 100644
--- a/libcxx/test/containers/associative/tree_remove.pass.cpp
+++ b/libcxx/test/containers/associative/tree_remove.pass.cpp
@@ -39,57 +39,57 @@ test1()
         Node d;
         Node e;
         Node y;
-    
+
         root.__left_ = &b;
-    
+
         b.__parent_ = &root;
         b.__left_ = &y;
         b.__right_ = &d;
         b.__is_black_ = true;
-    
+
         y.__parent_ = &b;
         y.__left_ = 0;
         y.__right_ = 0;
         y.__is_black_ = true;
-    
+
         d.__parent_ = &b;
         d.__left_ = &c;
         d.__right_ = &e;
         d.__is_black_ = false;
-    
+
         c.__parent_ = &d;
         c.__left_ = 0;
         c.__right_ = 0;
         c.__is_black_ = true;
-    
+
         e.__parent_ = &d;
         e.__left_ = 0;
         e.__right_ = 0;
         e.__is_black_ = true;
-    
+
         std::__tree_remove(root.__left_, &y);
         assert(std::__tree_invariant(root.__left_));
-    
+
         assert(root.__parent_ == 0);
         assert(root.__left_ == &d);
         assert(root.__right_ == 0);
         assert(root.__is_black_ == false);
-    
+
         assert(d.__parent_ == &root);
         assert(d.__left_ == &b);
         assert(d.__right_ == &e);
         assert(d.__is_black_ == true);
-    
+
         assert(b.__parent_ == &d);
         assert(b.__left_ == 0);
         assert(b.__right_ == &c);
         assert(b.__is_black_ == true);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(e.__parent_ == &d);
         assert(e.__left_ == 0);
         assert(e.__right_ == 0);
@@ -104,57 +104,57 @@ test1()
         Node d;
         Node e;
         Node y;
-    
+
         root.__left_ = &b;
-    
+
         b.__parent_ = &root;
         b.__right_ = &y;
         b.__left_ = &d;
         b.__is_black_ = true;
-    
+
         y.__parent_ = &b;
         y.__right_ = 0;
         y.__left_ = 0;
         y.__is_black_ = true;
-    
+
         d.__parent_ = &b;
         d.__right_ = &c;
         d.__left_ = &e;
         d.__is_black_ = false;
-    
+
         c.__parent_ = &d;
         c.__right_ = 0;
         c.__left_ = 0;
         c.__is_black_ = true;
-    
+
         e.__parent_ = &d;
         e.__right_ = 0;
         e.__left_ = 0;
         e.__is_black_ = true;
-    
+
         std::__tree_remove(root.__left_, &y);
         assert(std::__tree_invariant(root.__left_));
-    
+
         assert(root.__parent_ == 0);
         assert(root.__left_ == &d);
         assert(root.__right_ == 0);
         assert(root.__is_black_ == false);
-    
+
         assert(d.__parent_ == &root);
         assert(d.__right_ == &b);
         assert(d.__left_ == &e);
         assert(d.__is_black_ == true);
-    
+
         assert(b.__parent_ == &d);
         assert(b.__right_ == 0);
         assert(b.__left_ == &c);
         assert(b.__is_black_ == true);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__right_ == 0);
         assert(c.__left_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(e.__parent_ == &d);
         assert(e.__right_ == 0);
         assert(e.__left_ == 0);
@@ -170,67 +170,67 @@ test1()
         Node e;
         Node f;
         Node y;
-    
+
         root.__left_ = &b;
-    
+
         b.__parent_ = &root;
         b.__left_ = &y;
         b.__right_ = &d;
         b.__is_black_ = true;
-    
+
         y.__parent_ = &b;
         y.__left_ = 0;
         y.__right_ = 0;
         y.__is_black_ = true;
-    
+
         d.__parent_ = &b;
         d.__left_ = &c;
         d.__right_ = &e;
         d.__is_black_ = false;
-    
+
         c.__parent_ = &d;
         c.__left_ = &f;
         c.__right_ = 0;
         c.__is_black_ = true;
-    
+
         e.__parent_ = &d;
         e.__left_ = 0;
         e.__right_ = 0;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &c;
         f.__left_ = 0;
         f.__right_ = 0;
         f.__is_black_ = false;
-    
+
         std::__tree_remove(root.__left_, &y);
         assert(std::__tree_invariant(root.__left_));
-    
+
         assert(root.__parent_ == 0);
         assert(root.__left_ == &d);
         assert(root.__right_ == 0);
         assert(root.__is_black_ == false);
-    
+
         assert(d.__parent_ == &root);
         assert(d.__left_ == &f);
         assert(d.__right_ == &e);
         assert(d.__is_black_ == true);
-    
+
         assert(f.__parent_ == &d);
         assert(f.__left_ == &b);
         assert(f.__right_ == &c);
         assert(f.__is_black_ == false);
-    
+
         assert(b.__parent_ == &f);
         assert(b.__left_ == 0);
         assert(b.__right_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(c.__parent_ == &f);
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == true);
-    
+
         assert(e.__parent_ == &d);
         assert(e.__left_ == 0);
         assert(e.__right_ == 0);
@@ -246,67 +246,67 @@ test1()
         Node e;
         Node f;
         Node y;
-    
+
         root.__left_ = &b;
-    
+
         b.__parent_ = &root;
         b.__right_ = &y;
         b.__left_ = &d;
         b.__is_black_ = true;
-    
+
         y.__parent_ = &b;
         y.__right_ = 0;
         y.__left_ = 0;
         y.__is_black_ = true;
-    
+
         d.__parent_ = &b;
         d.__right_ = &c;
         d.__left_ = &e;
         d.__is_black_ = false;
-    
+
         c.__parent_ = &d;
         c.__right_ = &f;
         c.__left_ = 0;
         c.__is_black_ = true;
-    
+
         e.__parent_ = &d;
         e.__right_ = 0;
         e.__left_ = 0;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &c;
         f.__right_ = 0;
         f.__left_ = 0;
         f.__is_black_ = false;
-    
+
         std::__tree_remove(root.__left_, &y);
         assert(std::__tree_invariant(root.__left_));
-    
+
         assert(root.__parent_ == 0);
         assert(root.__left_ == &d);
         assert(root.__right_ == 0);
         assert(root.__is_black_ == false);
-    
+
         assert(d.__parent_ == &root);
         assert(d.__right_ == &f);
         assert(d.__left_ == &e);
         assert(d.__is_black_ == true);
-    
+
         assert(f.__parent_ == &d);
         assert(f.__right_ == &b);
         assert(f.__left_ == &c);
         assert(f.__is_black_ == false);
-    
+
         assert(b.__parent_ == &f);
         assert(b.__right_ == 0);
         assert(b.__left_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(c.__parent_ == &f);
         assert(c.__right_ == 0);
         assert(c.__left_ == 0);
         assert(c.__is_black_ == true);
-    
+
         assert(e.__parent_ == &d);
         assert(e.__right_ == 0);
         assert(e.__left_ == 0);