Fix more issues exposed by -pedantic-errors in c++03 mode

llvm-svn: 228711

27 files changed, 28 insertions, 26 deletions

diff --git a/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
index 77aaf3c131e..996fc9a18fe 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
@@ -46,7 +46,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 int main()
 {
diff --git a/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
index 8f732a06c7c..522f839973d 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
@@ -36,7 +36,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
index 1d1522cbcb3..9eb514ba92f 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
@@ -36,7 +36,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
index 0ac1d5a680c..fb00069f33b 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
@@ -36,7 +36,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
index 6594984fc0d..51a37cc33b7 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
@@ -38,7 +38,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
index fd6dd6e4ab6..3ab79a095fc 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
@@ -37,7 +37,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
index 806f7280332..7a0a2512ee2 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
@@ -39,7 +39,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
index aa977eb84bf..cf717c2e2f2 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
@@ -39,7 +39,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
index cf09d6e19b6..becf94ffb4e 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
@@ -39,7 +39,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
index bfab2a3a4fc..a45b75d25c9 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
@@ -36,7 +36,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
index 6e937ac0c4e..0576aca5c1a 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
@@ -38,7 +38,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
index 08ac6704f7f..ecb95d72a21 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
@@ -42,7 +42,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
index fe7b0cf11a6..b7e73f26502 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
@@ -39,7 +39,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
index 3e7767209e5..2737dfba773 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
@@ -38,7 +38,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
index 97827c1183a..fbbaad4f89e 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
@@ -36,7 +36,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
index e642f7132f5..b345faaf89e 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
@@ -36,7 +36,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
index e27edf51f79..d570ec33371 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
@@ -36,7 +36,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
index 444ab9ba955..96df6097d99 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
@@ -38,7 +38,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void test(int size)
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
index ea5926c65e1..d4ab0d3e2f2 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
@@ -41,7 +41,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void test(int size)
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
index 700edd3abdb..4d6443b1f96 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
@@ -36,7 +36,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
index 2f578184e3d..ea91ec1b0a4 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
@@ -39,7 +39,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void
diff --git a/libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
index 7dfb4bc5c2d..3a9962b330a 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
@@ -41,7 +41,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void testN(int start, int N)
diff --git a/libcxx/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp
index b484a865c57..ccb30a9997d 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp
@@ -41,7 +41,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void testN(int start, int N)
diff --git a/libcxx/test/std/containers/sequences/deque/deque.special/move.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.special/move.pass.cpp
index b100ba487ea..abd8e079975 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.special/move.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.special/move.pass.cpp
@@ -41,7 +41,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void testN(int start, int N)
diff --git a/libcxx/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp
index 072d7a78a30..ea04f6a15ac 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp
@@ -41,7 +41,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void testN(int start, int N)
diff --git a/libcxx/test/std/containers/sequences/deque/deque.special/swap.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.special/swap.pass.cpp
index 808144c9ebe..26757c351f1 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.special/swap.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.special/swap.pass.cpp
@@ -37,7 +37,7 @@ make(int size, int start = 0 )
     for (int i = 0; i < start; ++i)
         c.pop_front();
     return c;
-};
+}
 
 template <class C>
 void testN(int start, int N, int M)
diff --git a/libcxx/test/std/extensions/hash/specializations.pass.cpp b/libcxx/test/std/extensions/hash/specializations.pass.cpp
index 884614ec8a2..a222b1eb5c6 100644
--- a/libcxx/test/std/extensions/hash/specializations.pass.cpp
+++ b/libcxx/test/std/extensions/hash/specializations.pass.cpp
@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// NOTE: Undefined __DEPRECATED to prevent this test from failing with -Werror
+#undef __DEPRECATED
 #include <assert.h>
 #include <ext/hash_map>
 #include <string>