From stdcxx-commits-return-2044-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Fri Oct 26 14:34:23 2007 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 52524 invoked from network); 26 Oct 2007 14:34:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Oct 2007 14:34:23 -0000 Received: (qmail 91616 invoked by uid 500); 26 Oct 2007 14:34:11 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 91600 invoked by uid 500); 26 Oct 2007 14:34:11 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 91589 invoked by uid 99); 26 Oct 2007 14:34:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Oct 2007 07:34:11 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Oct 2007 14:34:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E2E441A9832; Fri, 26 Oct 2007 07:34:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r588665 - /incubator/stdcxx/trunk/src/ios_bits.cpp Date: Fri, 26 Oct 2007 14:34:00 -0000 To: stdcxx-commits@incubator.apache.org From: faridz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071026143400.E2E441A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faridz Date: Fri Oct 26 07:34:00 2007 New Revision: 588665 URL: http://svn.apache.org/viewvc?rev=588665&view=rev Log: 2007-10-26 Farid Zaripov Merged r588661 from branches/4.2.x * ios_bits.cpp [_MSC_VER > 1300]: Remove unnecessary conditional compilation directive. Modified: incubator/stdcxx/trunk/src/ios_bits.cpp Modified: incubator/stdcxx/trunk/src/ios_bits.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/ios_bits.cpp?rev=588665&r1=588664&r2=588665&view=diff ============================================================================== --- incubator/stdcxx/trunk/src/ios_bits.cpp (original) +++ incubator/stdcxx/trunk/src/ios_bits.cpp Fri Oct 26 07:34:00 2007 @@ -81,13 +81,9 @@ _RWSTD_DEFINE_STATIC_CONST (const ios_base::openmode ios_base::trunc); _RWSTD_DEFINE_STATIC_CONST (const ios_base::openmode ios_base::ate); -#if !defined (_MSC_VER) || (_MSC_VER <= 1300) - _RWSTD_DEFINE_STATIC_CONST (const ios_base::seekdir ios_base::beg); _RWSTD_DEFINE_STATIC_CONST (const ios_base::seekdir ios_base::cur); _RWSTD_DEFINE_STATIC_CONST (const ios_base::seekdir ios_base::end); - -#endif // !defined (_MSC_VER) || (_MSC_VER <= 1300) #ifndef _RWSTD_STRICT_ANSI