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 2007/03/06 20:28:52 UTC
svn commit: r515262 -
/incubator/stdcxx/trunk/tests/support/18.limits.traps.cpp
Author: sebor
Date: Tue Mar 6 11:28:51 2007
New Revision: 515262
URL: http://svn.apache.org/viewvc?view=rev&rev=515262
Log:
2007-03-06 Martin Sebor <se...@roguewave.com>
* 18.limits.traps.cpp (try_trap): Renamed from test_trap and declared
extern in order to allow it to be found by argument dependent lookup.
Modified:
incubator/stdcxx/trunk/tests/support/18.limits.traps.cpp
Modified: incubator/stdcxx/trunk/tests/support/18.limits.traps.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/support/18.limits.traps.cpp?view=diff&rev=515262&r1=515261&r2=515262
==============================================================================
--- incubator/stdcxx/trunk/tests/support/18.limits.traps.cpp (original)
+++ incubator/stdcxx/trunk/tests/support/18.limits.traps.cpp Tue Mar 6 11:28:51 2007
@@ -1,21 +1,28 @@
/***************************************************************************
*
- * 18/limits_traps.cpp - test exercising std::numeric_limits::traps
+ * 18.limits_traps.cpp - test exercising std::numeric_limits::traps
*
* $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.
+ * 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
+ *
+ * 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 Rogue Wave Software.
*
**************************************************************************/
@@ -83,8 +90,8 @@
template <class numT>
-static inline void
-test_trap (const volatile numT &one, const volatile numT &zero,
+inline void
+try_trap (const volatile numT &one, const volatile numT &zero,
numT &result, bool &trapped)
{
TRY {
@@ -96,6 +103,7 @@
}
}
+
template <class numT>
numT test_traps (numT, int lineno, bool)
{
@@ -145,7 +153,7 @@
// signal hanlder above and execution will resume by
// returning from setjmp() above again, but this time
// with a non-zero value
- test_trap (one, zero, result, trapped);
+ try_trap (one, zero, result, trapped);
}
rw_assert (trapped == traps, 0, lineno,