Return-Path: Delivered-To: apmail-stdcxx-commits-archive@www.apache.org Received: (qmail 21873 invoked from network); 26 Jun 2008 22:06:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Jun 2008 22:06:26 -0000 Received: (qmail 52460 invoked by uid 500); 26 Jun 2008 22:06:28 -0000 Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org Received: (qmail 52441 invoked by uid 500); 26 Jun 2008 22:06:28 -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 52432 invoked by uid 99); 26 Jun 2008 22:06:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jun 2008 15:06:28 -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, 26 Jun 2008 22:05:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6A1C123889F3; Thu, 26 Jun 2008 15:06:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r672039 - in /stdcxx/branches/4.3.x: include/rw/_meta_other.h tests/utilities/20.meta.rel.cpp Date: Thu, 26 Jun 2008 22:06:06 -0000 To: commits@stdcxx.apache.org From: vitek@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080626220606.6A1C123889F3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vitek Date: Thu Jun 26 15:06:06 2008 New Revision: 672039 URL: http://svn.apache.org/viewvc?rev=672039&view=rev Log: 2008-06-27 Travis Vitek * include/rw/_meta_other.h: Enclose type name in sizeof expression in parentheses as required. * tests/utilities/20.meta.rel.cpp [_RWSTD_NO_EXT_CXX_0X]: Move include inside guard to avoid #error. Modified: stdcxx/branches/4.3.x/include/rw/_meta_other.h stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp Modified: stdcxx/branches/4.3.x/include/rw/_meta_other.h URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_meta_other.h?rev=672039&r1=672038&r2=672039&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/rw/_meta_other.h (original) +++ stdcxx/branches/4.3.x/include/rw/_meta_other.h Thu Jun 26 15:06:06 2008 @@ -230,31 +230,31 @@ struct __rw_biggest { typedef typename - __rw_conditional<(sizeof _Type1 < sizeof _Type2), + __rw_conditional<(sizeof (_Type1) < sizeof (_Type2)), _Type2, _Type1>::type _Type12; typedef typename - __rw_conditional<(sizeof _Type3 < sizeof _Type4), + __rw_conditional<(sizeof (_Type3) < sizeof (_Type4)), _Type4, _Type3>::type _Type34; typedef typename - __rw_conditional<(sizeof _Type5 < sizeof _Type6), + __rw_conditional<(sizeof (_Type5) < sizeof (_Type6)), _Type6, _Type5>::type _Type56; typedef typename - __rw_conditional<(sizeof _Type7 < sizeof _Type8), + __rw_conditional<(sizeof (_Type7) < sizeof (_Type8)), _Type8, _Type7>::type _Type78; typedef typename - __rw_conditional<(sizeof _Type12 < sizeof _Type34), + __rw_conditional<(sizeof (_Type12) < sizeof (_Type34)), _Type34, _Type12>::type _Type1234; typedef typename - __rw_conditional<(sizeof _Type56 < sizeof _Type78), + __rw_conditional<(sizeof (_Type56) < sizeof (_Type78)), _Type78, _Type56>::type _Type5678; typedef typename - __rw_conditional<(sizeof _Type1234 < sizeof _Type5678), + __rw_conditional<(sizeof (_Type1234) < sizeof (_Type5678)), _Type5678, _Type1234>::type type; }; 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=672039&r1=672038&r2=672039&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 Thu Jun 26 15:06:06 2008 @@ -27,13 +27,14 @@ * **************************************************************************/ -#include - #include // compile out all test code if extensions disabled #ifndef _RWSTD_NO_EXT_CXX_0X +#include + + /**************************************************************************/ enum enum_A { E_a = 0 };