2010-02-17 Chris Jefferson <chris@bubblescope.net>

	* include/bits/locale_facets.h (__convert_to_v): Add empty
	exception-specification.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156837 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5eff61a..7bed518 100644 (file)
--- 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
 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 (file)
--- 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
 
 # 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.
   // NB: This is specialized for all required types, there is no
   // generic definition.

-  template<typename _Tv>
+  template<typename _Tp>

     void
     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<>
 
   // Explicit specializations for required types.
   template<>