Author: sebor
Date: Mon Jan 22 12:23:47 2007
New Revision: 498783
URL: http://svn.apache.org/viewvc?view=rev&rev=498783
Log:
2007-01-22 Martin Sebor <[EMAIL PROTECTED]>
STDCXX-327
* sstream (stringbuf::str): Added a public char_type* overload
to prevent compilation errors in strict mode when the 2 argument
overload is private.
* sstream.cc (stringbuf::str): Removed a comment.
Modified:
incubator/stdcxx/trunk/include/sstream
incubator/stdcxx/trunk/include/sstream.cc
Modified: incubator/stdcxx/trunk/include/sstream
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/sstream?view=diff&rev=498783&r1=498782&r2=498783
==============================================================================
--- incubator/stdcxx/trunk/include/sstream (original)
+++ incubator/stdcxx/trunk/include/sstream Mon Jan 22 12:23:47 2007
@@ -7,22 +7,23 @@
*
***************************************************************************
*
- * 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 1994-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 1994-2006 Rogue Wave Software.
*
**************************************************************************/
@@ -133,12 +134,17 @@
private:
-#endif // _RWSTD_NO_EXT_STRINGBUF_STR
-
// extension
- void str (const char_type*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
+ void str (const char_type*, _RWSTD_SIZE_T);
+
+#endif // _RWSTD_NO_EXT_STRINGBUF_STR
public:
+
+ // public extension for efficiency
+ void str (const char_type *__s) {
+ str (__s, traits_type::length (__s));
+ }
void str (const _C_string_type &__str) {
str (__str.data (), __str.size ());
Modified: incubator/stdcxx/trunk/include/sstream.cc
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/sstream.cc?view=diff&rev=498783&r1=498782&r2=498783
==============================================================================
--- incubator/stdcxx/trunk/include/sstream.cc (original)
+++ incubator/stdcxx/trunk/include/sstream.cc Mon Jan 22 12:23:47 2007
@@ -67,7 +67,7 @@
template<class _CharT, class _Traits, class _Allocator>
void
basic_stringbuf<_CharT, _Traits, _Allocator>::
-str (const char_type *__s, _RWSTD_SIZE_T __slen /* = -1 */)
+str (const char_type *__s, _RWSTD_SIZE_T __slen)
{
_RWSTD_ASSERT (this->_C_is_valid ());
