Author: sebor
Date: Sun Jul 23 16:50:25 2006
New Revision: 424860
URL: http://svn.apache.org/viewvc?rev=424860&view=rev
Log:
2006-07-23 Martin Sebor <[EMAIL PROTECTED]>
* 21.string.append.cpp (AppendRangeOverload): Qualified references
to dependent base member function begin() with this-> to allow lookup
to find them.
* 21.string.assign.cpp (AssignRangeOverload): Same.
* 21.string.cons.cpp (ConsRangeOverload): Same.
* 21.string.insert.cpp (InsertRangeOverload): Same.
Modified:
incubator/stdcxx/trunk/tests/strings/21.string.append.cpp
incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp
incubator/stdcxx/trunk/tests/strings/21.string.cons.cpp
incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp
Modified: incubator/stdcxx/trunk/tests/strings/21.string.append.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/strings/21.string.append.cpp?rev=424860&r1=424859&r2=424860&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.append.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.append.cpp Sun Jul 23
16:50:25 2006
@@ -6,22 +6,21 @@
*
***************************************************************************
*
- * Copyright 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 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.
*
**************************************************************************/
@@ -547,7 +546,7 @@
// exercise self-referential modification (i.e., replacing
// a range of elements with a subrange of its own elements)
- const Iterator first (begin (str, (Iterator*)0) + off);
+ const Iterator first (this->begin (str, (Iterator*)0) + off);
const Iterator last (first + ext);
return str.append (first, last);
@@ -555,7 +554,7 @@
String str_arg (tdata.arg_, tdata.arglen_);
- const Iterator first (begin (str_arg, (Iterator*)0) + off);
+ const Iterator first (this->begin (str_arg, (Iterator*)0) + off);
const Iterator last (first + ext);
return str.append (first, last);
Modified: incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp?rev=424860&r1=424859&r2=424860&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp Sun Jul 23
16:50:25 2006
@@ -6,22 +6,21 @@
*
***************************************************************************
*
- * Copyright 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 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.
*
**************************************************************************/
@@ -493,7 +492,7 @@
// exercise self-referential modification (i.e., replacing
// a range of elements with a subrange of its own elements)
- const Iterator first (begin (str, (Iterator*)0) + off);
+ const Iterator first (this->begin (str, (Iterator*)0) + off);
const Iterator last (first + ext);
return str.assign (first, last);
@@ -501,7 +500,7 @@
String str_arg (tdata.arg_, tdata.arglen_);
- const Iterator first (begin (str_arg, (Iterator*)0) + off);
+ const Iterator first (this->begin (str_arg, (Iterator*)0) + off);
const Iterator last (first + ext);
return str.assign (first, last);
Modified: incubator/stdcxx/trunk/tests/strings/21.string.cons.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/strings/21.string.cons.cpp?rev=424860&r1=424859&r2=424860&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.cons.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.cons.cpp Sun Jul 23 16:50:25
2006
@@ -6,16 +6,21 @@
*
***************************************************************************
*
- * 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.
*
**************************************************************************/
@@ -584,7 +589,7 @@
tdata.arglen_ - tdata.off2_ - tdata.ext2_ : tdata.off2_;
const std::size_t ext = tdata.ext2_;
- const Iterator first (begin (str_arg, (Iterator*)0) + off);
+ const Iterator first (this->begin (str_arg, (Iterator*)0) + off);
const Iterator last (first + ext);
if (Cons (range_alloc) == tdata.func_.which_) {
Modified: incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp?rev=424860&r1=424859&r2=424860&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp Sun Jul 23
16:50:25 2006
@@ -6,22 +6,21 @@
*
***************************************************************************
*
- * Copyright 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 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.
*
**************************************************************************/
@@ -616,7 +615,7 @@
// exercise self-referential modification (i.e., replacing
// a range of elements with a subrange of its own elements)
- const Iterator first2 (begin (str, (Iterator*)0) + off);
+ const Iterator first2 (this->begin (str, (Iterator*)0) + off);
const Iterator last2 (first2 + ext);
str.insert (first1, first2, last2);
@@ -625,7 +624,7 @@
String str_arg (tdata.arg_, tdata.arglen_);
- const Iterator first2 (begin (str_arg, (Iterator*)0) + off);
+ const Iterator first2 (this->begin (str_arg, (Iterator*)0) + off);
const Iterator last2 (first2 + ext);
str.insert (first1, first2, last2);
