You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2006/08/09 18:20:30 UTC
svn commit: r430084 - /incubator/stdcxx/trunk/tests/src/new.cpp
Author: sebor
Date: Wed Aug 9 09:20:24 2006
New Revision: 430084
URL: http://svn.apache.org/viewvc?rev=430084&view=rev
Log:
2006-08-09 Martin Sebor <se...@roguewave.com>
* new.cpp (_rw_find_block): Corrected a typo in conditionally
compiled code (Compaq C++ prior to version 6.6).
Modified:
incubator/stdcxx/trunk/tests/src/new.cpp
Modified: incubator/stdcxx/trunk/tests/src/new.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/src/new.cpp?rev=430084&r1=430083&r2=430084&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/src/new.cpp (original)
+++ incubator/stdcxx/trunk/tests/src/new.cpp Wed Aug 9 09:20:24 2006
@@ -6,22 +6,23 @@
*
************************************************************************
*
- * Copyright 2005 - 2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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
*
- * Copyright 2003 - 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
+ * 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.
+ * 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 2003-2006 Rogue Wave Software.
*
**************************************************************************/
@@ -213,7 +214,7 @@
abort ();
-#else
+#else // Compaq C++ < 6.6
// working around a bug in Compaq C++ libcxx
// Classic Iostreams library (see bug #359)
@@ -223,7 +224,7 @@
"%s:%d: %s (%#p): invalid pointer",
__FILE__, __LINE__, caller, ptr);
- print_heap ();
+ _rw_print_heap ();
abort ();
}
@@ -231,12 +232,10 @@
static int warned;
- if (!warned++) {
- rw_warning (0, 0, __LINE__,
- "%s:%d: %s (%#p): warning: invalid pointer; "
- "ignoring memory errors from here on out",
- __FILE__, __LINE__, caller, ptr);
- }
+ rw_warn (0 < warned++, 0, __LINE__,
+ "%s:%d: %s (%#p): warning: invalid pointer; "
+ "ignoring memory errors from here on out",
+ __FILE__, __LINE__, caller, ptr);
}
#endif // Compaq C++ >= 6.6