Author: sebor Date: Thu Jan 11 11:59:59 2007 New Revision: 495356 URL: http://svn.apache.org/viewvc?view=rev&rev=495356 Log: 2007-01-11 Martin Sebor * 26.accumulate.cpp (size_t): Qualifed with std:: since the type may not be declared in the global namespace (e.g., with Sun C++). Modified: incubator/stdcxx/trunk/tests/numerics/26.accumulate.cpp Modified: incubator/stdcxx/trunk/tests/numerics/26.accumulate.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/numerics/26.accumulate.cpp?view=diff&rev=495356&r1=495355&r2=495356 ============================================================================== --- incubator/stdcxx/trunk/tests/numerics/26.accumulate.cpp (original) +++ incubator/stdcxx/trunk/tests/numerics/26.accumulate.cpp Thu Jan 11 11:59:59 2007 @@ -6,23 +6,23 @@ * *************************************************************************** * + * 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 2006 The Apache Software Foundation or its licensors, - * as applicable. - * - * Copyright 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 2006 Rogue Wave Software. * **************************************************************************/ @@ -133,10 +133,10 @@ } }; -/* static */ size_t Y::n_total_op_plus_assign_; -/* static */ size_t* Y::op_plus_assign_throw_ptr_ = +/* static */ std::size_t Y::n_total_op_plus_assign_; +/* static */ std::size_t* Y::op_plus_assign_throw_ptr_ = &Y::op_plus_assign_throw_count_; -/* static */ size_t Y::op_plus_assign_throw_count_ = +/* static */ std::size_t Y::op_plus_assign_throw_count_ = std::size_t (-1); /**************************************************************************/