svn commit: r668347 - /stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp

[vitek]

Author: vitek
Date: Mon Jun 16 16:35:21 2008
New Revision: 668347

URL: http://svn.apache.org/viewvc?rev=668347&view=rev
Log:
2008-06-16  Travis Vitek  <[EMAIL PROTECTED]>

        STDCXX-921
        * tests/utilities/20.meta.rel.cpp: Update test to correctly
        reflect behaviors required by the standard.


Modified:
    stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp

Modified: stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp
URL: 
http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp?rev=668347&r1=668346&r2=668347&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp (original)
+++ stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp Mon Jun 16 16:35:21 
2008
@@ -184,21 +184,17 @@
     TEST (std::is_base_of, derived_<class_B>,
                             derived_<class_B>, true);
 
-    TEST (std::is_base_of, union_C, union_C, true);
+    TEST (std::is_base_of, union_C, union_C, false);
 
     // public inheritance
     TEST (std::is_base_of, struct_A, derived_<struct_A>, true);
     TEST (std::is_base_of, class_B, derived_<class_B>, true);
 
     // protected inheritance
-    TEST (std::is_convertible, derived_protected_<struct_A> , struct_A , 
true); // slice
-    TEST (std::is_convertible, derived_protected_<struct_A>*, struct_A*, true);
-    TEST (std::is_convertible, derived_protected_<struct_A>&, struct_A&, true);
+    TEST (std::is_base_of, derived_protected_<struct_A> , struct_A , true);
 
     // private inheritance
-    TEST (std::is_convertible, derived_private_<struct_A> , struct_A , true); 
// slice
-    TEST (std::is_convertible, derived_private_<struct_A>*, struct_A*, true);
-    TEST (std::is_convertible, derived_private_<struct_A>&, struct_A&, true);
+    TEST (std::is_base_of, derived_private_<struct_A> , struct_A , true);
 
     // other combinations should fail
     TEST (std::is_base_of, signed char, char, false);
@@ -235,16 +231,6 @@
     TEST (std::is_convertible, derived_<struct_A>*, struct_A*, true);
     TEST (std::is_convertible, derived_<struct_A>&, struct_A&, true);
 
-    // protected inheritance
-    TEST (std::is_convertible, derived_protected_<struct_A> , struct_A , 
false); // slice
-    TEST (std::is_convertible, derived_protected_<struct_A>*, struct_A*, 
false);
-    TEST (std::is_convertible, derived_protected_<struct_A>&, struct_A&, 
false);
-
-    // private inheritance
-    TEST (std::is_convertible, derived_private_<struct_A> , struct_A , false); 
// slice
-    TEST (std::is_convertible, derived_private_<struct_A>*, struct_A*, false);
-    TEST (std::is_convertible, derived_private_<struct_A>&, struct_A&, false);
-
     TEST (std::is_convertible, derived_<class_B> , class_B , true); // slice
     TEST (std::is_convertible, derived_<class_B>*, class_B*, true);
     TEST (std::is_convertible, derived_<class_B>&, class_B&, true);
@@ -346,7 +332,7 @@
     TEST (std::is_convertible, int (), int (&)(char), false);
 
     TEST (std::is_convertible, int*, void*, true);
-    TEST (std::is_convertible, int (*)(), void*, true);
+    TEST (std::is_convertible, int (*)(), void*, false);
 
     //TEST (std::is_convertible, int (*)(derived_<struct_A>::*), int 
(*)(struct_A::*), true);