stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r386705 - /incubator/stdcxx/trunk/tests/algorithms/25.equal.range.cpp
Date Fri, 17 Mar 2006 20:23:01 GMT
Author: sebor
Date: Fri Mar 17 12:22:59 2006
New Revision: 386705

URL: http://svn.apache.org/viewcvs?rev=386705&view=rev
Log:
2006-03-17  Martin Sebor  <sebor@roguewave.com>

	* 25.equal.range.cpp (Y ctor): Changed argument to char.
	(test_equal_range): Removed a cast to prevent gcc 3.2 from
	confusing an object definition with that of a function.

Modified:
    incubator/stdcxx/trunk/tests/algorithms/25.equal.range.cpp

Modified: incubator/stdcxx/trunk/tests/algorithms/25.equal.range.cpp
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/algorithms/25.equal.range.cpp?rev=386705&r1=386704&r2=386705&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/algorithms/25.equal.range.cpp (original)
+++ incubator/stdcxx/trunk/tests/algorithms/25.equal.range.cpp Fri Mar 17 12:22:59 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 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
+ *
+ * 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.
  * 
  **************************************************************************/
 
@@ -68,8 +74,9 @@
     X xval_;
 
     // not Default-Constructible
-    Y (int val, int /*dummy */): xval_ () {
-        xval_.val_ = val;
+    Y (char val, int /*dummy */): xval_ () {
+        typedef unsigned char UChar;
+        xval_.val_ = int (UChar (val));
     }
 
     // CopyConstructible
@@ -150,13 +157,11 @@
     const ForwardIterator first = make_iter (xsrc,     xsrc, xsrc_end, it);
     const ForwardIterator last  = make_iter (xsrc_end, xsrc, xsrc_end, it);
 
-    typedef unsigned char UChar;
-
     // construct the object to pass to the algorithm
     // the type of the object is distinct from the iterator's value_type
     // to detect unwarranted assumptions made by the implementation of
     // the algorithm
-    const Y value (UChar (val_char), 0 /* dummy */);
+    const Y value (val_char, 0 /* dummy */);
 
     // construct the Compare function object to pass to the algorithm
     // when `predicate' is true



Mime
View raw message