Return-Path: Delivered-To: apmail-stdcxx-commits-archive@www.apache.org Received: (qmail 48808 invoked from network); 9 Oct 2008 17:50:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Oct 2008 17:50:39 -0000 Received: (qmail 77967 invoked by uid 500); 9 Oct 2008 17:50:38 -0000 Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org Received: (qmail 77934 invoked by uid 500); 9 Oct 2008 17:50:38 -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 77925 invoked by uid 99); 9 Oct 2008 17:50:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Oct 2008 10:50:38 -0700 X-ASF-Spam-Status: No, hits=-1999.9 required=10.0 tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE 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, 09 Oct 2008 17:49:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9A6DB23888D5; Thu, 9 Oct 2008 10:50:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r703216 - in /stdcxx/branches/4.2.x: src/locale_body.h util/path.cpp Date: Thu, 09 Oct 2008 17:50:18 -0000 To: commits@stdcxx.apache.org From: faridz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081009175018.9A6DB23888D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faridz Date: Thu Oct 9 10:50:18 2008 New Revision: 703216 URL: http://svn.apache.org/viewvc?rev=703216&view=rev Log: 2008-10-09 Farid Zaripov * src/locale_body.h: Revert changes, accidentally committed in r703124. * util/path.cpp: Replace __CYGWIN32__ to __CYGWIN__ for consistency. Modified: stdcxx/branches/4.2.x/src/locale_body.h stdcxx/branches/4.2.x/util/path.cpp Modified: stdcxx/branches/4.2.x/src/locale_body.h URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/locale_body.h?rev=703216&r1=703215&r2=703216&view=diff ============================================================================== --- stdcxx/branches/4.2.x/src/locale_body.h (original) +++ stdcxx/branches/4.2.x/src/locale_body.h Thu Oct 9 10:50:18 2008 @@ -91,6 +91,8 @@ // (i.e., one with the same id) in the locale object _RWSTD_SIZE_T _C_byname_facet_bits; + __rw_mutex _C_mutex; + friend struct _STD::locale; public: @@ -163,6 +165,14 @@ return _RWSTD_ATOMIC_PREDECREMENT (__facet._C_ref, false); } + _RWSTD_SIZE_T _C_add_ref () { + return _RWSTD_ATOMIC_PREINCREMENT (_C_ref, _C_mutex); + } + + _RWSTD_SIZE_T _C_remove_ref () { + return _RWSTD_ATOMIC_PREDECREMENT (_C_ref, _C_mutex); + } + // access private facet name static const char* _C_get_cat_name (const __rw_facet &__facet) { return __facet._C_name; Modified: stdcxx/branches/4.2.x/util/path.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/path.cpp?rev=703216&r1=703215&r2=703216&view=diff ============================================================================== --- stdcxx/branches/4.2.x/util/path.cpp (original) +++ stdcxx/branches/4.2.x/util/path.cpp Thu Oct 9 10:50:18 2008 @@ -69,7 +69,7 @@ } -#if !defined (_WIN32) && !defined (__CYGWIN32__) +#if !defined (_WIN32) && !defined (__CYGWIN__) void create_symlink (const std::string &dir, @@ -112,7 +112,7 @@ } } -#endif // !_WIN32 && !__CYGWIN32__ +#endif // !_WIN32 && !__CYGWIN__ inline int