summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2009-01-06 22:00:25 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2009-01-06 22:00:25 +0000
commitac07b55ee20ac7ad868a2a2319f5f5e90cc2c316 (patch)
treedfe3770435287c8ff03fee82539bee95ff1b03f5 /libstdc++-v3
parent2061be83a91df76bb72c2646666ebabda67d91c4 (diff)
downloadgcc-ac07b55ee20ac7ad868a2a2319f5f5e90cc2c316.tar.gz
* include/tr1_impl/regex: Fix bad return statements and typos.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143137 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/tr1_impl/regex9
2 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 40444275d31..ee30286271b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-06 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * include/tr1_impl/regex: Fix bad return statements and typos.
+
2009-01-05 Benjamin Kosnik <bkoz@redhat.com>
* include/tr1_impl/regex: Remove unimplemented function definitions.
diff --git a/libstdc++-v3/include/tr1_impl/regex b/libstdc++-v3/include/tr1_impl/regex
index b6a8e8df0cd..2e7984127b0 100644
--- a/libstdc++-v3/include/tr1_impl/regex
+++ b/libstdc++-v3/include/tr1_impl/regex
@@ -555,7 +555,7 @@ namespace regex_constants
lookup_collatename(_Fwd_iter __first, _Fwd_iter __last) const;
/**
- * @brief Maps one or mire characters to a named character
+ * @brief Maps one or more characters to a named character
* classification.
*
* @param first beginning of the character sequence.
@@ -1067,7 +1067,7 @@ namespace regex_constants
inline void
swap(basic_regex<_Ch_type, _Rx_traits>& __lhs,
basic_regex<_Ch_type, _Rx_traits>& __rhs)
- { return __lhs.swap(__rhs); }
+ { __lhs.swap(__rhs); }
// [7.9] Class template sub_match
@@ -1817,6 +1817,7 @@ namespace regex_constants
{
match_results __tmp(__rhs);
this->swap(__tmp);
+ return *this;
}
/**
@@ -1880,7 +1881,7 @@ namespace regex_constants
* @brief Gets the offset of the beginning of the indicated submatch.
* @param sub indicates the submatch.
*
- * This function returns the offset from the beginnig of the target
+ * This function returns the offset from the beginning of the target
* sequence to the beginning of the submatch, unless the value of @p sub
* is zero (the default), in which case this function returns the offset
* from the beginning of the target sequence to the beginning of the
@@ -2083,7 +2084,7 @@ namespace regex_constants
inline void
swap(match_results<_Bi_iter, _Allocator>& __lhs,
match_results<_Bi_iter, _Allocator>& __rhs)
- { return __lhs.swap(__rhs); }
+ { __lhs.swap(__rhs); }
// [7.11.2] Function template regex_match
/**