stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r421700 - in /incubator/stdcxx/trunk/tests: diagnostics/19.exceptions.mt.cpp include/alarm.h include/rw_alarm.h src/alarm.cpp
Date Thu, 13 Jul 2006 20:18:07 GMT
Author: sebor
Date: Thu Jul 13 13:18:07 2006
New Revision: 421700

URL: http://svn.apache.org/viewvc?rev=421700&view=rev
Log:
2006-07-13  Martin Sebor  <sebor@roguewave.com>

	* alarm.h: Renamed...
	* rw_alarm.h: ...to this to avoid a name clash on HP-UX.
	* alarm.cpp: Included rw_alarm.h instead of alarm.h.
	* exceptions_mt.cpp: Same.

Added:
    incubator/stdcxx/trunk/tests/include/rw_alarm.h
      - copied unchanged from r419714, incubator/stdcxx/trunk/tests/include/alarm.h
Removed:
    incubator/stdcxx/trunk/tests/include/alarm.h
Modified:
    incubator/stdcxx/trunk/tests/diagnostics/19.exceptions.mt.cpp
    incubator/stdcxx/trunk/tests/src/alarm.cpp

Modified: incubator/stdcxx/trunk/tests/diagnostics/19.exceptions.mt.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/diagnostics/19.exceptions.mt.cpp?rev=421700&r1=421699&r2=421700&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/diagnostics/19.exceptions.mt.cpp (original)
+++ incubator/stdcxx/trunk/tests/diagnostics/19.exceptions.mt.cpp Thu Jul 13 13:18:07 2006
@@ -1,22 +1,28 @@
 /***************************************************************************
  *
- * 19.exceptions.mt.cpp - test exercising the thread safety of
- *                        the C++ Standard Library exception classes
+ * exceptions_mt.cpp - test exercising the thread safety
+ *                     of C++ Standard Library exception classes
  *
  * $Id$
  *
  ***************************************************************************
  *
- * 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 2005-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.
  * 
  **************************************************************************/
 
@@ -26,7 +32,7 @@
 #include <cassert>     // for assert
 #include <cstdio>      // for printf()
 
-#include <alarm.h>
+#include <rw_alarm.h>  // for rw_alarm()
 #include <cmdopt.h>
 #include <driver.h>
 #include <rwthread.h>

Modified: incubator/stdcxx/trunk/tests/src/alarm.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/src/alarm.cpp?rev=421700&r1=421699&r2=421700&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/src/alarm.cpp (original)
+++ incubator/stdcxx/trunk/tests/src/alarm.cpp Thu Jul 13 13:18:07 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 2005-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.
  * 
  **************************************************************************/
 
@@ -28,7 +34,7 @@
 #include <assert.h>   // for assert()
 #include <stdio.h>    // for sprintf()
 
-#include <alarm.h>
+#include <rw_alarm.h>    // for rw_alarm()
 #include <rw_printf.h>   // for rw_fprintf()
 
 



Mime
View raw message