assign_neg.cc: Adjust dg-error lines.

2008-07-16  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Adjust
	dg-error lines.
	* testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Likewise.
	* testsuite/20_util/duration/cons/1_neg.cc: Likewise.

	* include/tr1_impl/type_traits: Fix comment typo.

From-SVN: r137874

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 322fa80bd90c340203cc0840fe5fcac078ce395e..03bd7b87ba74618c80aed931a61e7534aca3692d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-16  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Adjust
+       dg-error lines.
+       * testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Likewise.
+       * testsuite/20_util/duration/cons/1_neg.cc: Likewise.
+
+       * include/tr1_impl/type_traits: Fix comment typo.
+
 2008-07-16  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/bits/unique_ptr.h: Remove stray character.

diff --git a/libstdc++-v3/include/tr1_impl/type_traits b/libstdc++-v3/include/tr1_impl/type_traits
index 5d0824a365fdaaf93ab441bcf26881d61cbf75b7..87633fa9804167265d3e8360f335ffeef5535be9 100644 (file)
--- a/libstdc++-v3/include/tr1_impl/type_traits
+++ b/libstdc++-v3/include/tr1_impl/type_traits
@@ -235,7 +235,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
   template<typename _Tp>
     struct is_member_pointer;
 
-  /// is_scalal
+  /// is_scalar
   template<typename _Tp>
     struct is_scalar
     : public integral_constant<bool, (is_arithmetic<_Tp>::value

diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc b/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc
index 8710d74de7e04e287ab36550ec72d235df1fd4c0..fa63dab22b5ada75d208ae2eb5fff04f024cee63 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc
@@ -41,6 +41,6 @@ test02()
 
 // { dg-error "instantiated from here" "" { target *-*-* } 30 }
 // { dg-error "instantiated from here" "" { target *-*-* } 39 }
-// { dg-error "not exactly representable" "" { target *-*-* } 202 }
-// { dg-error "integral duration with floating point" "" { target *-*-* } 186 }
+// { dg-error "not exactly representable" "" { target *-*-* } 203 }
+// { dg-error "integral duration with floating point" "" { target *-*-* } 187 }
 // { dg-excess-errors "In instantiation of" }

diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc
index ca3997422870cbf95c2d79dedb04b51fb75178ce..2e057104ec428eeaf909d6e3701b99f2e4f3b1ec 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc
@@ -39,4 +39,4 @@ void test01()
   m1 = m2;
 }
 // { dg-error "within this context" "" { target *-*-* } 39 } 
-// { dg-error "is private" "" { target *-*-* } 155 } 
+// { dg-error "is private" "" { target *-*-* } 154 } 

diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc
index 7f530c36e38fd0629e2da02f3b7efc3371156657..a98e73333e576921f9e31e90b3ee1c901bfc7d8f 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc
@@ -38,4 +38,4 @@ void test01()
   mutex_type m2(m1);
 }
 // { dg-error "within this context" "" { target *-*-* } 38 } 
-// { dg-error "is private" "" { target *-*-* } 154 } 
+// { dg-error "is private" "" { target *-*-* } 153 }