Author: sebor
Date: Wed Oct 19 13:13:57 2005
New Revision: 326677
URL: http://svn.apache.org/viewcvs?rev=326677&view=rev
Log:
2005-10-19 Martin Sebor <[EMAIL PROTECTED]>
STDCXX-54
* _mutex.h: Cast -1 to unsigned in order to silence gcc warnings
on IRIX: argument passing of negative value `-1' to `unsigned int'.
Modified:
incubator/stdcxx/trunk/include/rw/_mutex.h
Modified: incubator/stdcxx/trunk/include/rw/_mutex.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_mutex.h?rev=326677&r1=326676&r2=326677&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_mutex.h (original)
+++ incubator/stdcxx/trunk/include/rw/_mutex.h Wed Oct 19 13:13:57 2005
@@ -10,16 +10,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.
*
**************************************************************************/
@@ -992,21 +1004,22 @@
inline unsigned
__rw_atomic_preincrement (unsigned &__x, bool)
{
- return __add_then_test32 (&__x, 1);
+ return __add_then_test32 (&__x, 1U);
}
inline int
__rw_atomic_preincrement (int &__x, bool)
{
- return __rw_atomic_preincrement (_RWSTD_REINTERPRET_CAST (unsigned
int&,__x),false);
+ return __rw_atomic_preincrement (_RWSTD_REINTERPRET_CAST (unsigned&, __x),
+ false);
}
inline unsigned
__rw_atomic_predecrement (unsigned &__x, bool)
{
- return __add_then_test32 (&__x, -1);
+ return __add_then_test32 (&__x, unsigned (-1));
}
