Mailing-List: contact stdcxx-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: stdcxx-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of msebor@gmail.com designates
 209.85.146.180 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=beta;
        h=received:message-id:date:from:user-agent:mime-version:to:subject:references:in-reply-to:content-type:content-transfer-encoding:sender;
        b=IKe7JhX7my/H5EJZeeu9Gho87UZfQKLBIk9snVzJBqgdwDY0L+yX5hu63x2CPHYobsbonbrTIzHI1D31eVqBOgH9cJ/NwEpwtruy80f5vhrJF93N+VpluXy2ytut7K6VHxLgf1JCHDjaYBjqSVSCbVTIQa1d/OAHga4tlIYYiq8=
Message-ID: <4705B25E.5080904@roguewave.com>
Date: Thu, 04 Oct 2007 17:41:18 -1000
From: Martin Sebor <sebor@roguewave.com>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
 rv:1.8.1.2pre) Gecko/20070111 SeaMonkey/1.1
MIME-Version: 1.0
To: stdcxx-dev@incubator.apache.org
Subject: Re: svn commit: r581935 - in /incubator/stdcxx/trunk:
 include/loc/_punct.cc
 src/file.cpp
References: <20071004144508.99BB21A9842@eris.apache.org>
In-Reply-To: <20071004144508.99BB21A9842@eris.apache.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Martin Sebor <msebor@gmail.com>

faridz@apache.org wrote:
> Author: faridz
> Date: Thu Oct  4 07:45:07 2007
> New Revision: 581935
> 
> URL: http://svn.apache.org/viewvc?rev=581935&view=rev

Has this change been sufficiently tested on trunk before being
merging out to the branch?

Martin

> Log:
> 2007-10-04 Farid Zaripov <farid_zaripov@epam.com>
> 
> 	* Merged the head of branches/4.2.0
> 
> Modified:
>     incubator/stdcxx/trunk/include/loc/_punct.cc
>     incubator/stdcxx/trunk/src/file.cpp
> 
> Modified: incubator/stdcxx/trunk/include/loc/_punct.cc
> URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_punct.cc?rev=581935&r1=581934&r2=581935&view=diff
> ==============================================================================
> --- incubator/stdcxx/trunk/include/loc/_punct.cc (original)
> +++ incubator/stdcxx/trunk/include/loc/_punct.cc Thu Oct  4 07:45:07 2007
> @@ -87,7 +87,10 @@
>  
>              typedef _STD::char_traits<_CharT> _Traits;
>  
> -            if (__bits & 1UL << __k) {
> +            const _RWSTD_SIZE_T __mask =
> +                _RWSTD_STATIC_CAST(_RWSTD_SIZE_T, 1UL) << __k;
> +
> +            if (__bits & __mask) {
>                  // `name' is still in the set, see if the next char matches
>                  // (case insensitive comparison done if `ctp' is nonzero)
>                  if (   __pos < __sizes [__k]
> @@ -108,7 +111,7 @@
>  
>                          // this match is a duplicate of the last best one
>                          // remove this match from the set
> -                        __bits &= ~(1UL << __k);
> +                        __bits &= ~__mask;
>                          --__nmatch;
>                      }
>                      else if (   __sizes [__k] < __sizes [__inx]
> @@ -137,7 +140,7 @@
>  
>                      // clear the bit for the `name' that failed to match
>                      // and decrement the numeber of matches
> -                    __bits &= ~(1UL << __k);
> +                    __bits &= ~__mask;
>                      --__nmatch;
>                  }
>              }
> 
> Modified: incubator/stdcxx/trunk/src/file.cpp
> URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/file.cpp?rev=581935&r1=581934&r2=581935&view=diff
> ==============================================================================
> --- incubator/stdcxx/trunk/src/file.cpp (original)
> +++ incubator/stdcxx/trunk/src/file.cpp Thu Oct  4 07:45:07 2007
> @@ -475,13 +475,18 @@
>  }
>  
>  
> +#ifdef _WIN64
> +// disable MSVC warning: conversion from '__int64' to 'long', possible loss of data
> +#pragma warning (disable: 4244)
> +#endif
> +
>  _RWSTD_EXPORT long
>  __rw_fseek (void *file, int flags, _RWSTD_PTRDIFF_T offset, int origin)
>  {
>      if (flags & _RWSTD_IOS_STDIO) {
>          FILE* const fp = _RWSTD_STATIC_CAST (FILE*, file);
>  
> -        const int pos = fseek (fp, offset, origin);
> +        const int pos = fseek (fp, long (offset), origin);
>          if (pos < 0)
>              return long (pos);
>  
> @@ -522,6 +527,11 @@
>  
>      return write (fd, buf, size);
>  }
> +
> +#ifdef _WIN64
> +// restore MSVC warning: conversion from '__int64' to 'long', possible loss of data
> +#pragma warning (default: 4244)
> +#endif
>  
>  
>  _RWSTD_EXPORT extern const void* __rw_std_streams[];
> 
> 
>