From: Chris Jefferson <chris@bubblescope.net>
Date: Wed, 17 Feb 2010 21:09:10 +0000 (+0000)
Subject: locale_facets.h (__convert_to_v): Add empty exception-specification.
X-Git-Tag: releases/gcc-4.5.0~739
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a5f4935e89990dc061a1a238e3acd8ca2e234db;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5eff61ac9638..7bed51831251 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 b3f9001a52d5..b67c6a02d6ec 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<>