Author: sebor
Date: Wed Oct 19 13:15:19 2005
New Revision: 326678
URL: http://svn.apache.org/viewcvs?rev=326678&view=rev
Log:
2005-10-19 Martin Sebor <[EMAIL PROTECTED]>
STDCXX-55
* _specialized.h (__rw_new_capacity): Silenced a gcc -Wshadow warning
on IRIX.
* string (__rw_new_capacity): Same.
Modified:
incubator/stdcxx/trunk/include/rw/_specialized.h
incubator/stdcxx/trunk/include/string
Modified: incubator/stdcxx/trunk/include/rw/_specialized.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_specialized.h?rev=326678&r1=326677&r2=326678&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_specialized.h (original)
+++ incubator/stdcxx/trunk/include/rw/_specialized.h Wed Oct 19 13:15:19 2005
@@ -6,7 +6,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_specialized.h#13 $
+ * $Id$
*
***************************************************************************
*
@@ -23,16 +23,28 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright (c) 1994-2005 Quovadx, Inc. All Rights Reserved.
+ *
+ * This computer software is owned by Quovadx, Inc. and is protected by
+ * U.S. copyright laws and other laws and by international treaties.
+ * This computer software is furnished by Quovadx, Inc., pursuant to a
+ * written license agreement and may be used, copied, transmitted, and
+ * stored only in accordance with the terms of such license agreement and
+ * with the inclusion of the above copyright notice. This computer
+ * software or any other copies thereof may not be provided or otherwise
+ * made available to any other person.
+ *
+ *
+ * U.S. Government Restricted Rights.
+ *
+ * This computer software: (a) was developed at private expense and is in
+ * all respects the proprietary information of Quovadx, Inc.; (b) was not
+ * developed with government funds; (c) is a trade secret of Quovadx,
+ * Inc. for all purposes of the Freedom of Information Act; and (d) is a
+ * commercial item and thus, pursuant to Section 12.212 of the Federal
+ * Acquisition Regulations (FAR) and DFAR Supplement Section 227.7202,
+ * Government's use, duplication or disclosure of the computer software
+ * is subject to the restrictions set forth by Quovadx, Inc.
*
**************************************************************************/
@@ -59,9 +71,9 @@
inline _RWSTD_CONTAINER_SIZE_TYPE
__rw_new_capacity (_RWSTD_CONTAINER_SIZE_TYPE __size, const _Container*)
{
- typedef _RWSTD_CONTAINER_SIZE_TYPE _SizeT;
+ typedef _RWSTD_CONTAINER_SIZE_TYPE _RWSizeT;
- _SizeT __cap = _RWSTD_STATIC_CAST (_SizeT,
+ _RWSizeT __cap = _RWSTD_STATIC_CAST (_RWSizeT,
__size * _RWSTD_NEW_CAPACITY_RATIO);
return (__size += _RWSTD_MINIMUM_NEW_CAPACITY) > __cap ? __size : __cap;
}
Modified: incubator/stdcxx/trunk/include/string
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/string?rev=326678&r1=326677&r2=326678&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/string (original)
+++ incubator/stdcxx/trunk/include/string Wed Oct 19 13:15:19 2005
@@ -7,16 +7,28 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright (c) 1994-2005 Quovadx, Inc. All Rights Reserved.
+ *
+ * This computer software is owned by Quovadx, Inc. and is protected by
+ * U.S. copyright laws and other laws and by international treaties.
+ * This computer software is furnished by Quovadx, Inc., pursuant to a
+ * written license agreement and may be used, copied, transmitted, and
+ * stored only in accordance with the terms of such license agreement and
+ * with the inclusion of the above copyright notice. This computer
+ * software or any other copies thereof may not be provided or otherwise
+ * made available to any other person.
+ *
+ *
+ * U.S. Government Restricted Rights.
+ *
+ * This computer software: (a) was developed at private expense and is in
+ * all respects the proprietary information of Quovadx, Inc.; (b) was not
+ * developed with government funds; (c) is a trade secret of Quovadx,
+ * Inc. for all purposes of the Freedom of Information Act; and (d) is a
+ * commercial item and thus, pursuant to Section 12.212 of the Federal
+ * Acquisition Regulations (FAR) and DFAR Supplement Section 227.7202,
+ * Government's use, duplication or disclosure of the computer software
+ * is subject to the restrictions set forth by Quovadx, Inc.
*
**************************************************************************/
@@ -1477,10 +1489,10 @@
__rw_new_capacity (_RWSTD_STRING_SIZE_TYPE __size,
const _STD::basic_string<_CharT, _Traits, _Allocator>*)
{
- typedef _RWSTD_STRING_SIZE_TYPE _SizeT;
+ typedef _RWSTD_STRING_SIZE_TYPE _RWSizeT;
- _SizeT __cap =
- _RWSTD_STATIC_CAST (_SizeT, __size * _RWSTD_STRING_CAPACITY_RATIO);
+ _RWSizeT __cap =
+ _RWSTD_STATIC_CAST (_RWSizeT, __size * _RWSTD_STRING_CAPACITY_RATIO);
return (__size += _RWSTD_MINIMUM_STRING_CAPACITY) > __cap ? __size : __cap;
}
