From 596cf1ccde519b1090e39a8298c1bb14c229c7a8 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Fri, 17 Jul 2009 00:16:33 +0000
Subject: [PATCH] testsuite_common_types.h (standard_layout): Activate.
2009-07-16 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/util/testsuite_common_types.h (standard_layout): Activate.
* testsuite/29_atomics/atomic_integral/cons/assign_neg.cc: Adjust
line numbers.
* testsuite/29_atomics/atomic_integral/cons/copy_neg.cc: Same.
* testsuite/29_atomics/atomic/cons/assign_neg.cc: Same.
* testsuite/29_atomics/atomic/cons/copy_neg.cc: Same.
From-SVN: r149730
---
libstdc++-v3/ChangeLog | 9 +++++++++
.../testsuite/29_atomics/atomic/cons/assign_neg.cc | 2 +-
.../testsuite/29_atomics/atomic/cons/copy_neg.cc | 2 +-
.../29_atomics/atomic_integral/cons/assign_neg.cc | 4 ++--
.../29_atomics/atomic_integral/cons/copy_neg.cc | 4 ++--
libstdc++-v3/testsuite/util/testsuite_common_types.h | 8 ++------
6 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3c6ba9b2dd37..f7656a393f62 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-16 Benjamin Kosnik <bkoz@redhat.com>
+
+ * testsuite/util/testsuite_common_types.h (standard_layout): Activate.
+ * testsuite/29_atomics/atomic_integral/cons/assign_neg.cc: Adjust
+ line numbers.
+ * testsuite/29_atomics/atomic_integral/cons/copy_neg.cc: Same.
+ * testsuite/29_atomics/atomic/cons/assign_neg.cc: Same.
+ * testsuite/29_atomics/atomic/cons/copy_neg.cc: Same.
+
2009-07-16 Joseph Myers <joseph@codesourcery.com>
* configure: Regenerate.
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
index 0b73b080fbe7..e580d807585c 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
@@ -29,7 +29,7 @@ int main()
return 0;
}
-// { dg-error "used here" "" { target *-*-* } 525 }
+// { dg-error "used here" "" { target *-*-* } 521 }
// { dg-error "deleted function" "" { target *-*-* } 239 }
// { dg-error "deleted function" "" { target *-*-* } 257 }
// { dg-error "deleted function" "" { target *-*-* } 275 }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
index a261a84c9683..9108b4bc1acd 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
@@ -29,7 +29,7 @@ int main()
return 0;
}
-// { dg-error "used here" "" { target *-*-* } 564 }
+// { dg-error "used here" "" { target *-*-* } 560 }
// { dg-error "deleted function" "" { target *-*-* } 238 }
// { dg-error "deleted function" "" { target *-*-* } 256 }
// { dg-error "deleted function" "" { target *-*-* } 274 }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
index a488cb06d142..cf69ab2ee567 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
@@ -30,11 +30,11 @@ int main()
return 0;
}
-// { dg-error "used here" "" { target *-*-* } 525 }
+// { dg-error "used here" "" { target *-*-* } 521 }
// { dg-excess-errors "deleted function" }
// { dg-excess-errors "deleted function" }
// { dg-error "instantiated from" "" { target *-*-* } 29 }
-// { dg-error "instantiated from" "" { target *-*-* } 532 }
+// { dg-error "instantiated from" "" { target *-*-* } 528 }
// { dg-error "instantiated from" "" { target *-*-* } 170 }
// { dg-error "instantiated from" "" { target *-*-* } 399 }
// { dg-error "instantiated from" "" { target *-*-* } 168 }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
index 71eb282fcd80..369cba826f42 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
@@ -30,11 +30,11 @@ int main()
return 0;
}
-// { dg-error "used here" "" { target *-*-* } 564 }
+// { dg-error "used here" "" { target *-*-* } 560 }
// { dg-excess-errors "deleted function" }
// { dg-excess-errors "deleted function" }
// { dg-error "instantiated from" "" { target *-*-* } 29 }
-// { dg-error "instantiated from" "" { target *-*-* } 570 }
+// { dg-error "instantiated from" "" { target *-*-* } 566 }
// { dg-error "instantiated from" "" { target *-*-* } 170 }
// { dg-error "instantiated from" "" { target *-*-* } 399 }
// { dg-error "instantiated from" "" { target *-*-* } 168 }
diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h
index c6c00689f3da..a6c58be6f312 100644
--- a/libstdc++-v3/testsuite/util/testsuite_common_types.h
+++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h
@@ -474,12 +474,8 @@ namespace __gnu_test
{
void __constraint()
{
- // libstdc++/37907
- // typedef std::is_standard_layout<_Tp> standard_layout_p;
- // static_assert(standard_layout_p::value, "not standard_layout");
-
- typedef std::has_virtual_destructor<_Tp> ctor_p;
- static_assert(!ctor_p::value, "has virtual destructor");
+ typedef std::is_standard_layout<_Tp> standard_layout_p;
+ static_assert(standard_layout_p::value, "not standard_layout");
}
};
--
GitLab