Return-Path: Delivered-To: apmail-stdcxx-commits-archive@www.apache.org Received: (qmail 45304 invoked from network); 20 Jun 2008 17:28:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Jun 2008 17:28:04 -0000 Received: (qmail 95867 invoked by uid 500); 20 Jun 2008 17:28:06 -0000 Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org Received: (qmail 95850 invoked by uid 500); 20 Jun 2008 17:28:05 -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 95841 invoked by uid 99); 20 Jun 2008 17:28:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jun 2008 10:28:05 -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; Fri, 20 Jun 2008 17:27:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0763F23889F1; Fri, 20 Jun 2008 10:27:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r669999 - /stdcxx/branches/4.3.x/include/rw/_meta_other.h Date: Fri, 20 Jun 2008 17:27:42 -0000 To: commits@stdcxx.apache.org From: vitek@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080620172743.0763F23889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vitek Date: Fri Jun 20 10:27:42 2008 New Revision: 669999 URL: http://svn.apache.org/viewvc?rev=669999&view=rev Log: 2008-06-20 Travis Vitek STDCXX-926 * include/rw/_meta_other.h: Remove unnecessary whitespace, simplify workaround for msvc. Modified: stdcxx/branches/4.3.x/include/rw/_meta_other.h 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=669999&r1=669998&r2=669999&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/rw/_meta_other.h (original) +++ stdcxx/branches/4.3.x/include/rw/_meta_other.h Fri Jun 20 10:27:42 2008 @@ -266,31 +266,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; }; @@ -305,50 +305,40 @@ class _Type7 = __rw_empty, class _Type8 = __rw_empty> struct __rw_strictest { - // these enums necessary to avoid problems with VC8 - enum { - _C_select12 = __rw_alignment_of<_Type1>::value - < __rw_alignment_of<_Type2>::value, - _C_select34 = __rw_alignment_of<_Type3>::value - < __rw_alignment_of<_Type4>::value, - _C_select56 = __rw_alignment_of<_Type5>::value - < __rw_alignment_of<_Type6>::value, - _C_select78 = __rw_alignment_of<_Type7>::value - < __rw_alignment_of<_Type8>::value - }; - typedef typename - __rw_conditional<_C_select12, _Type2, _Type1>::type _Type12; + __rw_conditional< (__rw_alignment_of<_Type1>::value) + < (__rw_alignment_of<_Type2>::value), + _Type2, _Type1>::type _Type12; typedef typename - __rw_conditional<_C_select34, _Type4, _Type3>::type _Type34; + __rw_conditional< (__rw_alignment_of<_Type3>::value) + < (__rw_alignment_of<_Type4>::value), + _Type4, _Type3>::type _Type34; typedef typename - __rw_conditional<_C_select56, _Type6, _Type5>::type _Type56; + __rw_conditional< (__rw_alignment_of<_Type5>::value) + < (__rw_alignment_of<_Type6>::value), + _Type6, _Type5>::type _Type56; typedef typename - __rw_conditional<_C_select78, _Type8, _Type7>::type _Type78; - - enum { - _C_select1234 = __rw_alignment_of<_Type12>::value - < __rw_alignment_of<_Type34>::value, - _C_select5678 = __rw_alignment_of<_Type56>::value - < __rw_alignment_of<_Type78>::value - }; + __rw_conditional< (__rw_alignment_of<_Type7>::value) + < (__rw_alignment_of<_Type8>::value), + _Type8, _Type7>::type _Type78; typedef typename - __rw_conditional<_C_select1234, _Type34, _Type12>::type _Type1234; + __rw_conditional< (__rw_alignment_of<_Type12>::value) + < (__rw_alignment_of<_Type34>::value), + _Type34, _Type12>::type _Type1234; typedef typename - __rw_conditional<_C_select5678, _Type78, _Type56>::type _Type5678; - - enum { - _C_select = __rw_alignment_of<_Type1234>::value - < __rw_alignment_of<_Type5678>::value - }; + __rw_conditional< (__rw_alignment_of<_Type56>::value) + < (__rw_alignment_of<_Type78>::value), + _Type78, _Type56>::type _Type5678; typedef typename - __rw_conditional<_C_select, _Type5678, _Type1234>::type type; + __rw_conditional< (__rw_alignment_of<_Type1234>::value) + < (__rw_alignment_of<_Type5678>::value), + _Type5678, _Type1234>::type type; }; template <_RWSTD_SIZE_T _Len,