Fixing whitespace problems

llvm-svn: 111758

80 files changed, 124 insertions, 124 deletions

diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp
index 8212dd14a3f..8dbf0ca54dd 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp
@@ -50,5 +50,5 @@ int main()
         assert(f2.sgetc() == L'2');
     }
     remove("test.dat");
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp
index d3ecb47f0e2..9c2aa4f0859 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 // class basic_filebuf
 
-// template <class charT, class traits> 
+// template <class charT, class traits>
 // void
 // swap(basic_filebuf<charT, traits>& x, basic_filebuf<charT, traits>& y);
 
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/default.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/default.pass.cpp
index 87fc38a526f..d66ccdc755e 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/default.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/default.pass.cpp
@@ -27,4 +27,4 @@ int main()
         std::wfilebuf f;
         assert(!f.is_open());
     }
-}    
+}
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp
index 35aaac8404a..d25d4e89ed5 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp
@@ -48,5 +48,5 @@ int main()
         assert(f2.sgetc() == L'2');
     }
     remove("test.dat");
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp
index 6790841c0d8..6939fe78f08 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp
@@ -46,4 +46,4 @@ int main()
         assert(f.sbumpc() == L'3');
     }
     remove("test.dat");
-}    
+}
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp
index 3e8a198936e..b0169fde22b 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp
@@ -137,4 +137,4 @@ int main()
         assert(f.sbumpc() == -1);
     }
     std::remove("overflow.dat");
-}    
+}
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp
index c93faa74286..9058a628b90 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp
@@ -53,4 +53,4 @@ int main()
         assert(f.sbumpc() == 'a');
         assert(f.sgetc() == '2');
     }
-}    
+}
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/seekoff.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/seekoff.pass.cpp
index 32d846e2a4f..6d7da9f0108 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/seekoff.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/seekoff.pass.cpp
@@ -9,9 +9,9 @@
 
 // <fstream>
 
-// pos_type seekoff(off_type off, ios_base::seekdir way, 
+// pos_type seekoff(off_type off, ios_base::seekdir way,
 //                  ios_base::openmode which = ios_base::in | ios_base::out);
-// pos_type seekpos(pos_type sp, 
+// pos_type seekpos(pos_type sp,
 //                  ios_base::openmode which = ios_base::in | ios_base::out);
 
 // This test is not entirely portable
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.dat b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.dat
index e2e107ac61a..28d14454c38 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.dat
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.dat
@@ -1 +1 @@
-123456789
\ No newline at end of file
+123456789
diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp
index 1f6336277d0..6d2c5e58e8e 100644
--- a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp
@@ -116,4 +116,4 @@ int main()
         assert(f.sbumpc() == 0x4E53);
         assert(f.sbumpc() == -1);
     }
-}    
+}
diff --git a/libcxx/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp
index 448bfd4435f..1f7f2a1b5be 100644
--- a/libcxx/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp
@@ -44,5 +44,5 @@ int main()
         assert(x == 3.25);
     }
     std::remove("test.dat");
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp
index 0a9aabad860..3cd6793c432 100644
--- a/libcxx/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 // class basic_fstream
 
-// template <class charT, class traits> 
+// template <class charT, class traits>
 //   void swap(basic_fstream<charT, traits>& x, basic_fstream<charT, traits>& y);
 
 #include <fstream>
diff --git a/libcxx/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp
index 97b4b24ceae..efc1386d573 100644
--- a/libcxx/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp
@@ -42,5 +42,5 @@ int main()
         assert(x == 3.25);
     }
     std::remove("test.dat");
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/move_assign.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/move_assign.pass.cpp
index e6ebab0b286..2b864fd05ad 100644
--- a/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/move_assign.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/move_assign.pass.cpp
@@ -36,5 +36,5 @@ int main()
         fs >> x;
         assert(x == 3.25);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/nonmember_swap.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/nonmember_swap.pass.cpp
index 94b5efb5546..b460a88e466 100644
--- a/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/nonmember_swap.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/nonmember_swap.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 // class basic_ifstream
 
-// template <class charT, class traits> 
+// template <class charT, class traits>
 //   void swap(basic_ifstream<charT, traits>& x, basic_ifstream<charT, traits>& y);
 
 #include <fstream>
diff --git a/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/move.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/move.pass.cpp
index 85f3cc55bc1..b8ed752da3e 100644
--- a/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/move.pass.cpp
@@ -34,5 +34,5 @@ int main()
         fs >> x;
         assert(x == 3.25);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp
index 565181e6ddb..2d637a502d3 100644
--- a/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp
@@ -46,5 +46,5 @@ int main()
         assert(x == 3.25);
     }
     remove("test.dat");
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp
index 162a7a80e41..37f07b5fbb9 100644
--- a/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 // class basic_ofstream
 
-// template <class charT, class traits> 
+// template <class charT, class traits>
 //   void swap(basic_ofstream<charT, traits>& x, basic_ofstream<charT, traits>& y);
 
 #include <fstream>
diff --git a/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp
index cab73abddad..cacd615fbb0 100644
--- a/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp
@@ -44,5 +44,5 @@ int main()
         assert(x == 3.25);
     }
     remove("test.dat");
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign.pass.cpp
index 1b72bfbb034..b5da10207af 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign.pass.cpp
@@ -33,11 +33,11 @@ struct test_iostream
     typedef std::basic_iostream<CharT> base;
     test_iostream(testbuf<CharT>* sb) : base(sb) {}
 
-    test_iostream& operator=(test_iostream&& s) 
+    test_iostream& operator=(test_iostream&& s)
         {base::operator=(std::move(s)); return *this;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -88,5 +88,5 @@ int main()
         assert(is2.precision() == 6);
         assert(is2.getloc().name() == "C");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move.pass.cpp
index 58e01350c3a..8d9dd067962 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move.pass.cpp
@@ -33,11 +33,11 @@ struct test_iostream
     typedef std::basic_iostream<CharT> base;
     test_iostream(testbuf<CharT>* sb) : base(sb) {}
 
-    test_iostream(test_iostream&& s) 
+    test_iostream(test_iostream&& s)
         : base(std::move(s)) {}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -74,5 +74,5 @@ int main()
         assert(is.precision() == 6);
         assert(is.getloc().name() == "C");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart.pass.cpp
index d4e3ae3e25b..c46d33ebb0b 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// template<class charT, class traits> 
+// template<class charT, class traits>
 //   basic_istream<charT,traits>& operator>>(basic_istream<charT,traits>&& in, charT& c);
 
 #include <istream>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char.pass.cpp
index fe44a570b09..8c9aa0dddca 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// template<class traits> 
+// template<class traits>
 //   basic_istream<char,traits>& operator>>(basic_istream<char,traits>&& in, signed char& c);
 
 #include <istream>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer.pass.cpp
index ab5f106989a..a86ad313752 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// template<class traits> 
+// template<class traits>
 //   basic_istream<char,traits>& operator>>(basic_istream<char,traits>&& in, signed char* s);
 
 #include <istream>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char.pass.cpp
index 5c7631dc849..4f5cb30d897 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// template<class traits> 
+// template<class traits>
 //   basic_istream<char,traits>& operator>>(basic_istream<char,traits>&& in, unsigned char& c);
 
 #include <istream>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer.pass.cpp
index cae37dab8e6..4ee1f5d4a4d 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// template<class traits> 
+// template<class traits>
 //   basic_istream<char,traits>& operator>>(basic_istream<char,traits>&& in, unsigned char* s);
 
 #include <istream>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer.pass.cpp
index 9ca4079bde4..adda4f14b96 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// template<class charT, class traits> 
+// template<class charT, class traits>
 //   basic_istream<charT,traits>& operator>>(basic_istream<charT,traits>&& in, charT* s);
 
 #include <istream>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
index 403fa6ca385..e3ed45ea61d 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// template <class charT, class traits> 
+// template <class charT, class traits>
 //   basic_istream<charT,traits>&
 //   ws(basic_istream<charT,traits>& is);
 
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.rvalue/rvalue.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.rvalue/rvalue.pass.cpp
index 7f24283e1bf..b238263ec80 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.rvalue/rvalue.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.rvalue/rvalue.pass.cpp
@@ -9,8 +9,8 @@
 
 // <istream>
 
-// template <class charT, class traits, class T> 
-//   basic_istream<charT, traits>& 
+// template <class charT, class traits, class T>
+//   basic_istream<charT, traits>&
 //   operator>>(basic_istream<charT, traits>&& is, T& x);
 
 #include <istream>
@@ -42,7 +42,7 @@ public:
     CharT* egptr() const {return base::egptr();}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -59,5 +59,5 @@ int main()
         std::wistream(&sb) >> i;
         assert(i == 123);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp
index f2af2b57c7b..1007346f90a 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// basic_istream<charT,traits>& get(basic_streambuf<char_type,traits>& sb); 
+// basic_istream<charT,traits>& get(basic_streambuf<char_type,traits>& sb);
 
 #include <istream>
 #include <cassert>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp
index 64166d412a6..139ee70d580 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp
@@ -9,8 +9,8 @@
 
 // <istream>
 
-// basic_istream<charT,traits>& get(basic_streambuf<char_type,traits>& sb, 
-//                                  char_type delim); 
+// basic_istream<charT,traits>& get(basic_streambuf<char_type,traits>& sb,
+//                                  char_type delim);
 
 #include <istream>
 #include <cassert>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp
index 8b3ded77354..8c97e875fd3 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp
@@ -9,7 +9,7 @@
 
 // <istream>
 
-// basic_istream<charT,traits>& 
+// basic_istream<charT,traits>&
 //    ignore(streamsize n = 1, int_type delim = traits::eof());
 
 #include <istream>
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream/istream.assign/move_assign.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream/istream.assign/move_assign.pass.cpp
index 2860523d27c..daeb85a05bd 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream/istream.assign/move_assign.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream/istream.assign/move_assign.pass.cpp
@@ -37,7 +37,7 @@ struct test_istream
         {base::operator=(std::move(s)); return *this;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -88,5 +88,5 @@ int main()
         assert(is2.precision() == 6);
         assert(is2.getloc().name() == "C");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/input.streams/istream/istream.cons/move.pass.cpp b/libcxx/test/input.output/iostream.format/input.streams/istream/istream.cons/move.pass.cpp
index 4637011a302..7b59eba1381 100644
--- a/libcxx/test/input.output/iostream.format/input.streams/istream/istream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/input.streams/istream/istream.cons/move.pass.cpp
@@ -37,7 +37,7 @@ struct test_istream
         : base(std::move(s)) {}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -74,5 +74,5 @@ int main()
         assert(is.precision() == 6);
         assert(is.getloc().name() == "C");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.assign/move_assign.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.assign/move_assign.pass.cpp
index ca98e073f77..71f1fdf6d4c 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.assign/move_assign.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.assign/move_assign.pass.cpp
@@ -37,7 +37,7 @@ struct test_ostream
         {base::operator=(std::move(s)); return *this;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -88,5 +88,5 @@ int main()
         assert(os2.precision() == 6);
         assert(os2.getloc().name() == "C");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.cons/move.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.cons/move.pass.cpp
index c078c20aa9f..96b2265c6a2 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.cons/move.pass.cpp
@@ -37,7 +37,7 @@ struct test_ostream
         : base(std::move(s)) {}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -70,5 +70,5 @@ int main()
         assert(os.precision() == 6);
         assert(os.getloc().name() == "C");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
index 8ce73c63dfa..cf1803d95ca 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class charT, class traits> 
+// template<class charT, class traits>
 //   basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>& out, charT c);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
index 3b98f8f1a3a..20e4ba7ad0b 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class charT, class traits> 
+// template<class charT, class traits>
 //   basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>& out, const charT* s);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
index 6658cd8e41a..0b2bd4a9eec 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class char, class traits> 
+// template<class char, class traits>
 //   basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>& out, char c);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
index 56733aa2991..187a50b7f6d 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class traits> 
+// template<class traits>
 //   basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>& out, const char* s);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
index e6b06ed01de..a24005b9928 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class charT, class traits> 
+// template<class charT, class traits>
 //   basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>& out, char c);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
index 55a4dea3911..7a8b4c7ce7d 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class charT, class traits> 
+// template<class charT, class traits>
 //   basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>& out, const char* s);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
index c33c0fcc0c2..9a50c671ca7 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class char, class traits> 
+// template<class char, class traits>
 //   basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>& out, signed char c);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
index 65c08da0bf6..4abfa11e800 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class traits> 
+// template<class traits>
 //   basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>& out, const signed char* s);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
index d7441a75caa..6e1ccf341f7 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class char, class traits> 
+// template<class char, class traits>
 //   basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>& out, unsigned char c);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
index 00f73188524..997b2de3705 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template<class traits> 
+// template<class traits>
 //   basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>& out, const unsigned char* s);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp
index 69efd45e6d8..fed7007d1c0 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp
@@ -12,8 +12,8 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// basic_ostream<charT,traits>& operator<< 
-//           (basic_ostream<charT,traits>& (*pf)(basic_ostream<charT,traits>&)) 
+// basic_ostream<charT,traits>& operator<<
+//           (basic_ostream<charT,traits>& (*pf)(basic_ostream<charT,traits>&))
 
 #include <ostream>
 #include <cassert>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
index 9596a1cd126..188560e9836 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template <class charT, class traits> 
+// template <class charT, class traits>
 //   basic_ostream<charT,traits>& endl(basic_ostream<charT,traits>& os);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
index 5c944db3bbf..8e1d3e3901c 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template <class charT, class traits> 
+// template <class charT, class traits>
 //   basic_ostream<charT,traits>& ends(basic_ostream<charT,traits>& os);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
index a18b88cd0f8..455d8489938 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template <class charT, class traits> 
+// template <class charT, class traits>
 //   basic_ostream<charT,traits>& flush(basic_ostream<charT,traits>& os);
 
 #include <ostream>
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp
index d60ae8a1fae..a6884f08261 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp
@@ -12,8 +12,8 @@
 // template <class charT, class traits = char_traits<charT> >
 //   class basic_ostream;
 
-// template <class charT, class traits, class T> 
-//   basic_ostream<charT, traits>& 
+// template <class charT, class traits, class T>
+//   basic_ostream<charT, traits>&
 //   operator<<(basic_ostream<charT, traits>&& os, const T& x);
 
 #include <ostream>
@@ -53,7 +53,7 @@ protected:
         }
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -68,5 +68,5 @@ int main()
         std::wostream(&sb) << L"123";
         assert(sb.str() == L"123");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
index 48ab5e0e5a2..6d379c1ce82 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
@@ -28,7 +28,7 @@ struct testbuf
 
 protected:
 
-    typename base::pos_type 
+    typename base::pos_type
     seekpos(typename base::pos_type sp, std::ios_base::openmode which)
     {
         ++seekpos_called;
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
index e690dfbb0f0..551ec2ea5dc 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
@@ -28,7 +28,7 @@ struct testbuf
 
 protected:
 
-    typename base::pos_type 
+    typename base::pos_type
     seekoff(typename base::off_type off, std::ios_base::seekdir way,
                                          std::ios_base::openmode which)
     {
diff --git a/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/tellp.pass.cpp b/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/tellp.pass.cpp
index 1e993a6e5c0..77e07270c6e 100644
--- a/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/tellp.pass.cpp
+++ b/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/tellp.pass.cpp
@@ -28,7 +28,7 @@ struct testbuf
 
 protected:
 
-    typename base::pos_type 
+    typename base::pos_type
     seekoff(typename base::off_type off, std::ios_base::seekdir way, std::ios_base::openmode which)
     {
         assert(off == 0);
diff --git a/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cerr.pass.cpp b/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cerr.pass.cpp
index 7bdcc7f5bbb..96a261a3c08 100644
--- a/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cerr.pass.cpp
+++ b/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cerr.pass.cpp
@@ -21,5 +21,5 @@ int main()
 #else
     assert(std::cerr.tie() == &std::cout);
     assert(std::cerr.flags() & std::ios_base::unitbuf);
-#endif
+#endif  // 0
 }
diff --git a/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cin.pass.cpp b/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cin.pass.cpp
index c72cdc84f33..ca0d6caa34b 100644
--- a/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cin.pass.cpp
+++ b/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cin.pass.cpp
@@ -22,7 +22,7 @@ int main()
     std::cout << "Enter a number: ";
     std::cin >> i;
     std::cout << "The number is : " << i << '\n';
-#else
+#else  // 0
     assert(std::cin.tie() == &std::cout);
 #endif
 }
diff --git a/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cout.pass.cpp b/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cout.pass.cpp
index 7d3bf5b1bee..177d3263dc7 100644
--- a/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cout.pass.cpp
+++ b/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cout.pass.cpp
@@ -21,7 +21,7 @@ int main()
     std::cout << "Enter a number: ";
     std::cin >> i;
     std::cout << "The number is : " << i << '\n';
-#else
+#else  // 0
     (void)std::cout;
 #endif
 }
diff --git a/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcerr.pass.cpp b/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcerr.pass.cpp
index e52963880cb..42a1a1f91e4 100644
--- a/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcerr.pass.cpp
+++ b/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcerr.pass.cpp
@@ -21,5 +21,5 @@ int main()
 #else
     assert(std::wcerr.tie() == &std::wcout);
     assert(std::wcerr.flags() & std::ios_base::unitbuf);
-#endif
+#endif  // 0
 }
diff --git a/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcin.pass.cpp b/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcin.pass.cpp
index ea47089edd2..3fe929dd3eb 100644
--- a/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcin.pass.cpp
+++ b/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcin.pass.cpp
@@ -22,7 +22,7 @@ int main()
     std::wcout << L"Enter a number: ";
     std::wcin >> i;
     std::wcout << L"The number is : " << i << L'\n';
-#else
+#else  // 0
     assert(std::wcin.tie() == &std::wcout);
 #endif
 }
diff --git a/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp b/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp
index c6cb8c86bd0..4bde3827bc5 100644
--- a/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp
+++ b/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp
@@ -11,21 +11,21 @@
 
 // class ios_base
 
-// static const fmtflags boolalpha; 
-// static const fmtflags dec; 
-// static const fmtflags fixed; 
-// static const fmtflags hex; 
-// static const fmtflags internal; 
-// static const fmtflags left; 
-// static const fmtflags oct; 
-// static const fmtflags right; 
-// static const fmtflags scientific; 
-// static const fmtflags showbase; 
-// static const fmtflags showpoint; 
-// static const fmtflags showpos; 
-// static const fmtflags skipws; 
-// static const fmtflags unitbuf; 
-// static const fmtflags uppercase; 
+// static const fmtflags boolalpha;
+// static const fmtflags dec;
+// static const fmtflags fixed;
+// static const fmtflags hex;
+// static const fmtflags internal;
+// static const fmtflags left;
+// static const fmtflags oct;
+// static const fmtflags right;
+// static const fmtflags scientific;
+// static const fmtflags showbase;
+// static const fmtflags showpoint;
+// static const fmtflags showpos;
+// static const fmtflags skipws;
+// static const fmtflags unitbuf;
+// static const fmtflags uppercase;
 // static const fmtflags adjustfield = left | right | internal;
 // static const fmtflags basefield   = dec | oct | hex;
 // static const fmtflags floatfield  = scientific | fixed;
diff --git a/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp b/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp
index be93743616a..79ba42b8a9e 100644
--- a/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp
+++ b/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp
@@ -12,8 +12,8 @@
 // class ios_base
 
 // static const iostate badbit;
-// static const iostate eofbit; 
-// static const iostate failbit; 
+// static const iostate eofbit;
+// static const iostate failbit;
 // static const iostate goodbit = 0;
 
 #include <ios>
diff --git a/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp b/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp
index f80c3007707..867708be7b4 100644
--- a/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp
+++ b/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp
@@ -12,11 +12,11 @@
 // class ios_base
 
 // static const openmode app;
-// static const openmode ate; 
-// static const openmode binary; 
-// static const openmode in; 
-// static const openmode out; 
-// static const openmode trunc; 
+// static const openmode ate;
+// static const openmode binary;
+// static const openmode in;
+// static const openmode out;
+// static const openmode trunc;
 
 #include <ios>
 #include <cassert>
diff --git a/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp b/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp
index 150cbba31c0..afc5bfc5d60 100644
--- a/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp
+++ b/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp
@@ -12,8 +12,8 @@
 // class ios_base
 
 // static const seekdir beg;
-// static const seekdir cur; 
-// static const seekdir end; 
+// static const seekdir cur;
+// static const seekdir end;
 
 #include <ios>
 #include <cassert>
diff --git a/libcxx/test/input.output/iostreams.base/ios/types.pass.cpp b/libcxx/test/input.output/iostreams.base/ios/types.pass.cpp
index 1764afc44a7..58c0724ad8f 100644
--- a/libcxx/test/input.output/iostreams.base/ios/types.pass.cpp
+++ b/libcxx/test/input.output/iostreams.base/ios/types.pass.cpp
@@ -9,15 +9,15 @@
 
 // <ios>
 
-// template <class charT, class traits = char_traits<charT> > 
+// template <class charT, class traits = char_traits<charT> >
 // class basic_ios : public ios_base
 // {
 // public:
-//     typedef charT char_type; 
-//     typedef typename traits::int_type int_type; 
-//     typedef typename traits::pos_type pos_type; 
-//     typedef typename traits::off_type off_type; 
-//     typedef traits traits_type; 
+//     typedef charT char_type;
+//     typedef typename traits::int_type int_type;
+//     typedef typename traits::pos_type pos_type;
+//     typedef typename traits::off_type off_type;
+//     typedef traits traits_type;
 
 #include <ios>
 #include <type_traits>
diff --git a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff.pass.cpp b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff.pass.cpp
index 4b67d5112e2..ad809d4b755 100644
--- a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff.pass.cpp
+++ b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 // class basic_streambuf;
 
-// pos_type pubseekoff(off_type off, ios_base::seekdir way, 
+// pos_type pubseekoff(off_type off, ios_base::seekdir way,
 //                     ios_base::openmode which = ios_base::in | ios_base::out);
 
 #include <streambuf>
diff --git a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos.pass.cpp b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos.pass.cpp
index 3552590c730..66082ff14a6 100644
--- a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos.pass.cpp
+++ b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT> >
 // class basic_streambuf;
 
-// pos_type pubseekpos(pos_type sp, 
+// pos_type pubseekpos(pos_type sp,
 //                     ios_base::openmode which = ios_base::in | ios_base::out;
 
 #include <streambuf>
diff --git a/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp b/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp
index 7b8817e5aca..cd83c7885b7 100644
--- a/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp
+++ b/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp
@@ -46,5 +46,5 @@ int main()
         ss >> i;
         assert(i == 456);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/nonmember_swap.pass.cpp b/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/nonmember_swap.pass.cpp
index 74a3d1e2d1e..77ca9df5ce0 100644
--- a/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/nonmember_swap.pass.cpp
+++ b/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/nonmember_swap.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 // class basic_istringstream
 
-// template <class charT, class traits, class Allocator> 
+// template <class charT, class traits, class Allocator>
 //   void
 //   swap(basic_istringstream<charT, traits, Allocator>& x,
 //        basic_istringstream<charT, traits, Allocator>& y);
diff --git a/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/move.pass.cpp b/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/move.pass.cpp
index dfa4234b3fa..53587891aee 100644
--- a/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/move.pass.cpp
@@ -44,5 +44,5 @@ int main()
         ss >> i;
         assert(i == 456);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/string.pass.cpp b/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/string.pass.cpp
index df57f2551fa..33488d4df2c 100644
--- a/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/string.pass.cpp
+++ b/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/string.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 // class basic_istringstream
 
-// explicit basic_istringstream(const basic_string<charT,traits,allocator>& str, 
+// explicit basic_istringstream(const basic_string<charT,traits,allocator>& str,
 //                              ios_base::openmode which = ios_base::in);
 
 #include <sstream>
diff --git a/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/move.pass.cpp b/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/move.pass.cpp
index 9d644536e34..63e08462821 100644
--- a/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/move.pass.cpp
+++ b/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/move.pass.cpp
@@ -42,5 +42,5 @@ int main()
         ss << i << ' ' << 567;;
         assert(ss.str() == L"234 5676");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/move.pass.cpp b/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/move.pass.cpp
index 0192a90d6a3..75d22ac8797 100644
--- a/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/move.pass.cpp
@@ -40,5 +40,5 @@ int main()
         ss << i << ' ' << 567;;
         assert(ss.str() == L"234 5676");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/string.pass.cpp b/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/string.pass.cpp
index 88074dad7b9..50c5506613a 100644
--- a/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/string.pass.cpp
+++ b/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/string.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 // class basic_ostringstream
 
-// explicit basic_ostringstream(const basic_string<charT,traits,allocator>& str, 
+// explicit basic_ostringstream(const basic_string<charT,traits,allocator>& str,
 //                              ios_base::openmode which = ios_base::in);
 
 #include <sstream>
diff --git a/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap.pass.cpp b/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap.pass.cpp
index d3cc3c88b04..7b826cf683d 100644
--- a/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap.pass.cpp
+++ b/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap.pass.cpp
@@ -12,8 +12,8 @@
 // template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 // class basic_stringbuf
 
-// template <class charT, class traits, class Allocator> 
-//   void swap(basic_stringbuf<charT, traits, Allocator>& x, 
+// template <class charT, class traits, class Allocator>
+//   void swap(basic_stringbuf<charT, traits, Allocator>& x,
 //             basic_stringbuf<charT, traits, Allocator>& y);
 
 #include <sstream>
diff --git a/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/string.pass.cpp b/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/string.pass.cpp
index 752ff365f5e..e98198bf738 100644
--- a/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/string.pass.cpp
+++ b/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/string.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 // class basic_stringbuf
 
-// explicit basic_stringbuf(const basic_string<charT,traits,Allocator>& s, 
+// explicit basic_stringbuf(const basic_string<charT,traits,Allocator>& s,
 //                          ios_base::openmode which = ios_base::in | ios_base::out);
 
 #include <sstream>
diff --git a/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff.pass.cpp b/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff.pass.cpp
index f1e3fbc62e9..528d4f456eb 100644
--- a/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff.pass.cpp
+++ b/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 // class basic_stringbuf
 
-// pos_type seekoff(off_type off, ios_base::seekdir way, 
+// pos_type seekoff(off_type off, ios_base::seekdir way,
 //                  ios_base::openmode which = ios_base::in | ios_base::out);
 
 #include <sstream>
diff --git a/libcxx/test/input.output/string.streams/stringstream.cons/move.pass.cpp b/libcxx/test/input.output/string.streams/stringstream.cons/move.pass.cpp
index 42b08c49d99..280e164e5a6 100644
--- a/libcxx/test/input.output/string.streams/stringstream.cons/move.pass.cpp
+++ b/libcxx/test/input.output/string.streams/stringstream.cons/move.pass.cpp
@@ -48,5 +48,5 @@ int main()
         ss << i << ' ' << 123;
         assert(ss.str() == L"456 1236 ");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/string.streams/stringstream.cons/string.pass.cpp b/libcxx/test/input.output/string.streams/stringstream.cons/string.pass.cpp
index 71b09d131ee..e4e0297c247 100644
--- a/libcxx/test/input.output/string.streams/stringstream.cons/string.pass.cpp
+++ b/libcxx/test/input.output/string.streams/stringstream.cons/string.pass.cpp
@@ -12,7 +12,7 @@
 // template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 // class basic_stringstream
 
-// explicit basic_stringstream(const basic_string<charT,traits,Allocator>& str, 
+// explicit basic_stringstream(const basic_string<charT,traits,Allocator>& str,
 //                             ios_base::openmode which = ios_base::out|ios_base::in);
 
 #include <sstream>
diff --git a/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp b/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp
index 4437380a708..cbcbfb4279a 100644
--- a/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp
+++ b/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp
@@ -50,5 +50,5 @@ int main()
         ss << i << ' ' << 123;
         assert(ss.str() == L"456 1236 ");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp b/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp
index 73d8ad8bd31..2c14c5d1a66 100644
--- a/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp
+++ b/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp
@@ -12,9 +12,9 @@
 // template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 // class basic_stringstream
 
-// template <class charT, class traits, class Allocator> 
+// template <class charT, class traits, class Allocator>
 //   void
-//   swap(basic_stringstream<charT, traits, Allocator>& x, 
+//   swap(basic_stringstream<charT, traits, Allocator>& x,
 //        basic_stringstream<charT, traits, Allocator>& y);
 
 #include <sstream>