Return-Path: Delivered-To: apmail-stdcxx-commits-archive@www.apache.org Received: (qmail 91130 invoked from network); 19 Jun 2008 23:37:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jun 2008 23:37:11 -0000 Received: (qmail 28658 invoked by uid 500); 19 Jun 2008 23:37:13 -0000 Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org Received: (qmail 28643 invoked by uid 500); 19 Jun 2008 23:37:13 -0000 Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@stdcxx.apache.org Delivered-To: mailing list commits@stdcxx.apache.org Received: (qmail 28634 invoked by uid 99); 19 Jun 2008 23:37:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2008 16:37:13 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2008 23:36:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 08C862388A16; Thu, 19 Jun 2008 16:36:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r669745 - /stdcxx/branches/4.3.x/tests/utilities/20.meta.unary.comp.cpp Date: Thu, 19 Jun 2008 23:36:20 -0000 To: commits@stdcxx.apache.org From: vitek@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080619233621.08C862388A16@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vitek Date: Thu Jun 19 16:36:20 2008 New Revision: 669745 URL: http://svn.apache.org/viewvc?rev=669745&view=rev Log: 2008-06-19 Travis Vitek STDCXX-919 * tests/utilities/20.meta.unary.comp (test_is_scalar): Update test expectations to match requirements. (test_is_object): Ditto. (test_is_compound): Ditto. Modified: stdcxx/branches/4.3.x/tests/utilities/20.meta.unary.comp.cpp Modified: stdcxx/branches/4.3.x/tests/utilities/20.meta.unary.comp.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/utilities/20.meta.unary.comp.cpp?rev=669745&r1=669744&r2=669745&view=diff ============================================================================== --- stdcxx/branches/4.3.x/tests/utilities/20.meta.unary.comp.cpp (original) +++ stdcxx/branches/4.3.x/tests/utilities/20.meta.unary.comp.cpp Thu Jun 19 16:36:20 2008 @@ -261,11 +261,14 @@ void test_is_object () { + // an object type is a (possibly cv-qualified) type that is not a + // function type, not a reference type, and not a void type. + // void TEST (std::is_object, void, false); // integral - TEST (std::is_object, bool, false); + TEST (std::is_object, bool, true); TEST (std::is_object, char, true); TEST (std::is_object, signed char, true); @@ -354,6 +357,10 @@ void test_is_scalar () { + // arithmetic types, enumeration types, pointer types, pointer to member + // types and std::nullptr_t, and cv-qualified versions of these types + // are collectively called scalar types. + // void TEST (std::is_scalar, void, false); @@ -411,8 +418,8 @@ TEST (std::is_scalar, double&, false); // pointer to member - TEST (std::is_scalar, long (class_t::*), false); - TEST (std::is_scalar, int (struct_t::*), false); + TEST (std::is_scalar, long (class_t::*), true); + TEST (std::is_scalar, int (struct_t::*), true); // pointer to member function TEST (std::is_scalar, double (class_t::*)(), true); @@ -435,8 +442,8 @@ TEST (std::is_scalar, float (char), false); // function pointer - TEST (std::is_scalar, long (*)(), false); - TEST (std::is_scalar, double (*)(int), false); + TEST (std::is_scalar, long (*)(), true); + TEST (std::is_scalar, double (*)(int), true); // function reference TEST (std::is_scalar, long (&)(), false); @@ -447,8 +454,9 @@ void test_is_compound () { -// arrays, functions, pointers, references, classes, unions, -// enumerations, pointer to non-static class members + // arrays, functions, pointers, function pointers, + // references, function references, classes, unions, + // enumerations, pointer to non-static class members // void TEST (std::is_compound, void, false); @@ -488,13 +496,14 @@ TEST (std::is_compound, long double, false); // array - TEST (std::is_compound, long [4], false); - TEST (std::is_compound, float [3][3], false); - TEST (std::is_compound, char* [4], false); - TEST (std::is_compound, class_t [], false); - TEST (std::is_compound, struct_t [][2], false); + TEST (std::is_compound, long [4], true); + TEST (std::is_compound, float [3][3], true); + TEST (std::is_compound, char* [4], true); + TEST (std::is_compound, class_t [], true); + TEST (std::is_compound, struct_t [][2], true); // pointer + TEST (std::is_compound, void*, true); TEST (std::is_compound, long*, true); TEST (std::is_compound, char**, true); @@ -506,6 +515,11 @@ TEST (std::is_compound, class_t&, true); TEST (std::is_compound, double&, true); +#ifndef _RWSTD_NO_RVALUE_REFERENCES + TEST (std::is_compound, union_t&&, true); + TEST (std::is_compound, double&&, true); +#endif + // pointer to member TEST (std::is_compound, long (class_t::*), true); TEST (std::is_compound, int (struct_t::*), true); @@ -531,14 +545,17 @@ TEST (std::is_compound, float (char), true); // function pointer - TEST (std::is_compound, long (*)(), false); - TEST (std::is_compound, double (*)(int), false); + TEST (std::is_compound, long (*)(), true); + TEST (std::is_compound, double (*)(int), true); // function reference - TEST (std::is_compound, long (&)(), false); + TEST (std::is_compound, long (&)(), true); // member function reference - //TEST (std::is_compound, long (class_t::&), false); + typedef long (class_t::*memfun_t_ptr)(); + typedef std::remove_pointer::type memfun_t; + typedef std::add_lvalue_reference::type memfun_t_ref; + TEST (std::is_compound, memfun_t_ref, true); } void test_is_member_pointer ()