aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Jefferson <chris@bubblescope.net>2010-02-17 21:09:10 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2010-02-17 21:09:10 +0000
commit2a5f4935e89990dc061a1a238e3acd8ca2e234db (patch)
tree09cdf980aad14db615a2f6ca008ed57db27b182f
parent01305d242d27ca853a6b9c2ba0262aec8b32552d (diff)
downloadgcc-2a5f4935e89990dc061a1a238e3acd8ca2e234db.zip
gcc-2a5f4935e89990dc061a1a238e3acd8ca2e234db.tar.gz
gcc-2a5f4935e89990dc061a1a238e3acd8ca2e234db.tar.bz2
locale_facets.h (__convert_to_v): Add empty exception-specification.
2010-02-17 Chris Jefferson <chris@bubblescope.net> * include/bits/locale_facets.h (__convert_to_v): Add empty exception-specification. From-SVN: r156837
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/locale_facets.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5eff61a..7bed518 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-17 Chris Jefferson <chris@bubblescope.net>
+
+ * include/bits/locale_facets.h (__convert_to_v): Add empty
+ exception-specification.
+
2010-02-17 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/limits: Implement resolution of DR 559 (CD1) in
diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index b3f9001..b67c6a0 100644
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -58,13 +58,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
# define _GLIBCXX_NUM_FACETS 14
#endif
- // Convert string to numeric value of type _Tv and store results.
+ // Convert string to numeric value of type _Tp and store results.
// NB: This is specialized for all required types, there is no
// generic definition.
- template<typename _Tv>
+ template<typename _Tp>
void
- __convert_to_v(const char* __in, _Tv& __out, ios_base::iostate& __err,
- const __c_locale& __cloc);
+ __convert_to_v(const char*, _Tp&, ios_base::iostate&,
+ const __c_locale&) throw();
// Explicit specializations for required types.
template<>