From stdcxx-commits-return-663-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Fri May 05 01:14:48 2006 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 8150 invoked from network); 5 May 2006 01:14:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 May 2006 01:14:48 -0000 Received: (qmail 87497 invoked by uid 500); 5 May 2006 01:14:48 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 87476 invoked by uid 500); 5 May 2006 01:14:48 -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 87465 invoked by uid 99); 5 May 2006 01:14:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 18:14:47 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 18:14:47 -0700 Received: (qmail 7977 invoked by uid 65534); 5 May 2006 01:14:26 -0000 Message-ID: <20060505011426.7976.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399908 - /incubator/stdcxx/trunk/tests/include/rw_new.h Date: Fri, 05 May 2006 01:14:26 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sebor Date: Thu May 4 18:14:25 2006 New Revision: 399908 URL: http://svn.apache.org/viewcvs?rev=399908&view=rev Log: 2006-05-04 Martin Sebor * rw_new.h (operator new, operator delete): Guarded definitions of the replacement operators with _RWSTD_NO_REPLACEABLE_NEW_DELETE in order to allow the header to be included unconditionally, w/o regard to the setting of the macro, and with no adverse effects even when the macro is defined. Modified: incubator/stdcxx/trunk/tests/include/rw_new.h Modified: incubator/stdcxx/trunk/tests/include/rw_new.h URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/include/rw_new.h?rev=399908&r1=399907&r2=399908&view=diff ============================================================================== --- incubator/stdcxx/trunk/tests/include/rw_new.h (original) +++ incubator/stdcxx/trunk/tests/include/rw_new.h Thu May 4 18:14:25 2006 @@ -6,16 +6,22 @@ * *************************************************************************** * - * 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 2005-2006 The Apache Software Foundation or its licensors, + * as applicable. + * + * Copyright 2004-2006 Rogue Wave Software. + * + * 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. * **************************************************************************/ @@ -152,6 +158,7 @@ # ifndef _RWSTD_TEST_SRC +# ifndef _RWSTD_NO_REPLACEABLE_NEW_DELETE // prevent defining the replacement operator // when compiling in the test suite framework @@ -167,8 +174,8 @@ } -# if !defined (_RWSTD_NO_OPERATOR_NEW_ARRAY) \ - || defined (_RWSTD_NO_EXT_OPERATOR_NEW) +# if !defined (_RWSTD_NO_OPERATOR_NEW_ARRAY) \ + || defined (_RWSTD_NO_EXT_OPERATOR_NEW) // replaceable only if we don't provide a definition in void* operator new[] (_RWSTD_SIZE_T n) _THROWS ((_RWSTD_BAD_ALLOC)) @@ -176,10 +183,10 @@ return operator_new (n, true); } -# endif // !_RWSTD_NO_OPERATOR_NEW_ARRAY || _RWSTD_NO_EXT_OPERATOR_NEW +# endif // !_RWSTD_NO_OPERATOR_NEW_ARRAY || _RWSTD_NO_EXT_OPERATOR_NEW -# if !defined (_RWSTD_NO_OPERATOR_DELETE_ARRAY) \ - || defined (_RWSTD_NO_EXT_OPERATOR_NEW) +# if !defined (_RWSTD_NO_OPERATOR_DELETE_ARRAY) \ + || defined (_RWSTD_NO_EXT_OPERATOR_NEW) // replaceable only if we don't provide a definition in void operator delete[] (void *ptr) _THROWS (()) @@ -188,6 +195,7 @@ } -# endif // !_RWSTD_NO_OPERATOR_DELETE_ARRAY || _RWSTD_NO_EXT_OPERATOR_NEW +# endif // !_NO_OPERATOR_DELETE_ARRAY || _NO_EXT_OPERATOR_NEW +# endif // _RWSTD_NO_REPLACEABLE_NEW_DELETE # endif // !_RWSTD_TEST_SRC #endif // RW_NEW_H_INCLUDED