* src/pool_allocator.cc (_M_get_free_list, _M_get_mutex): Mark throw ()

	* src/mt_allocator.cc (_M_reclaim_block, _M_reclaim_block,
	_M_destroy_thread_key): Mark throw ()
	* debug.cc (_M_get_mutex, _M_attach_single, _M_detach_single,
	_M_singular, _M_can_compare _M_get_mutex, _M_message,
	_M_get_max_length): Mark throw ().
	* include/debug/formatter.h (_M_message, _M_format_word,
	_M_get_max_length): Mark throw ().
	* include/debug/safe_base.h (_M_get_mutex, _M_attach_single,
	_M_detach_single): Mark throw ().
	(_M_singular, _M_can_compare, _M_get_mutex): Mark pure and throw ().
	* include/ext/pool_allocator.h (_M_get_free_list): Mark const and
	throw ()
	(_M_get_mutex): Mark throw ().
	* include/ext/mt_allocator.h (_M_reclaim_block): Mark throw ();
	(_M_destroy_thread_key): Mark CONST and throw.
	* include/bits/stl_list.h (swap, transfer, reverse, hook, unhook): Mark
	throw ().

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4994ce8..8b0d0e0 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,26 @@
 2009-04-18  Jan Hubicka  <jh@suse.cz>
 
 2009-04-18  Jan Hubicka  <jh@suse.cz>
 

+       * src/pool_allocator.cc (_M_get_free_list, _M_get_mutex): Mark throw ()
+       * src/mt_allocator.cc (_M_reclaim_block, _M_reclaim_block,
+       _M_destroy_thread_key): Mark throw ()
+       * debug.cc (_M_get_mutex, _M_attach_single, _M_detach_single,
+       _M_singular, _M_can_compare _M_get_mutex, _M_message,
+       _M_get_max_length): Mark throw ().
+       * include/debug/formatter.h (_M_message, _M_format_word,
+       _M_get_max_length): Mark throw ().
+       * include/debug/safe_base.h (_M_get_mutex, _M_attach_single,
+       _M_detach_single): Mark throw ().
+       (_M_singular, _M_can_compare, _M_get_mutex): Mark pure and throw ().
+       * include/ext/pool_allocator.h (_M_get_free_list): Mark const and
+       throw ()
+       (_M_get_mutex): Mark throw ().
+       * include/ext/mt_allocator.h (_M_reclaim_block): Mark throw ();
+       (_M_destroy_thread_key): Mark CONST and throw.
+       * include/bits/stl_list.h (swap, transfer, reverse, hook, unhook): Mark
+       throw ().
+
+2009-04-18  Jan Hubicka  <jh@suse.cz>
+

        * src/condition_variable.cc (condition_variable,
        condition_variable_any constructors): Mark throw()
        * src/hash.cc (operator() for long double, string, and wstring): Mark
        * src/condition_variable.cc (condition_variable,
        condition_variable_any constructors): Mark throw()
        * src/hash.cc (operator() for long double, string, and wstring): Mark


@@ -16,15 +37,18 @@
        * include/std/mutex (mutex): Mark throw ().
        * include/bits/stl_list.h (swap, transfer, reverse, hook, unhook): Mark
        throw.
        * include/std/mutex (mutex): Mark throw ().
        * include/bits/stl_list.h (swap, transfer, reverse, hook, unhook): Mark
        throw.

-       * include/bits/functional_hash.h (operator()  on size_t): Mark pure and throw ().
+       * include/bits/functional_hash.h (operator()  on size_t): Mark pure
+       and throw ().

        * include/bits/locale_facets.tcc (__verify_grouping): Mark pure.
        * include/bits/locale_classes.h (_S_initialize_once,
        _S_clone_c_locale): Mark throw ().
        (_S_get_c_name): Mark const and throw ().
        * include/bits/locale_facets.tcc (__verify_grouping): Mark pure.
        * include/bits/locale_classes.h (_S_initialize_once,
        _S_clone_c_locale): Mark throw ().
        (_S_get_c_name): Mark const and throw ().

-       (_M_id, _M_compare, _M_transform, _M_compare, _M_transform): Mark throw ().
+       (_M_id, _M_compare, _M_transform, _M_compare, _M_transform): Mark
+       throw ().

        * include/bits/locale_facets.h (__convert_to_v explicit instances):
        Mark throw ().
        * include/bits/locale_facets.h (__convert_to_v explicit instances):
        Mark throw ().

-       (_M_convert_to_wmask, _M_initialize_ctype, _S_format_float): Mark throw ().
+       (_M_convert_to_wmask, _M_initialize_ctype, _S_format_float): Mark
+       throw ().

        * include/bits/ios_base.h (_M_dispose_callbacks, _M_init, imbue,
        ios_base): Mark throw ()
        * include/bits/locale_facets_nonio.h (_M_put): Mark throw.
        * include/bits/ios_base.h (_M_dispose_callbacks, _M_init, imbue,
        ios_base): Mark throw ()
        * include/bits/locale_facets_nonio.h (_M_put): Mark throw.

diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h
index 6f4f8ed..6dffc6b 100644 (file)
--- a/libstdc++-v3/include/debug/formatter.h
+++ b/libstdc++-v3/include/debug/formatter.h
@@ -346,7 +346,7 @@ namespace __gnu_debug
     { _M_text = __text; return *this; }
 
     const _Error_formatter&
     { _M_text = __text; return *this; }
 
     const _Error_formatter&

-    _M_message(_Debug_msg_id __id) const;
+    _M_message(_Debug_msg_id __id) const throw ();

 
     _GLIBCXX_NORETURN void
     _M_error() const;
 
     _GLIBCXX_NORETURN void
     _M_error() const;


@@ -359,7 +359,7 @@ namespace __gnu_debug
 
     template<typename _Tp>
       void
 
     template<typename _Tp>
       void

-      _M_format_word(char*, int, const char*, _Tp) const;
+      _M_format_word(char*, int, const char*, _Tp) const throw ();

 
     void
     _M_print_word(const char* __word) const;
 
     void
     _M_print_word(const char* __word) const;


@@ -368,7 +368,7 @@ namespace __gnu_debug
     _M_print_string(const char* __string) const;
 
     void
     _M_print_string(const char* __string) const;
 
     void

-    _M_get_max_length() const;
+    _M_get_max_length() const throw ();

 
     enum { __max_parameters = 9 };
 
 
     enum { __max_parameters = 9 };
 

diff --git a/libstdc++-v3/include/debug/safe_base.h b/libstdc++-v3/include/debug/safe_base.h
index 1bef5e7..9d44539 100644 (file)
--- a/libstdc++-v3/include/debug/safe_base.h
+++ b/libstdc++-v3/include/debug/safe_base.h
@@ -105,7 +105,7 @@ namespace __gnu_debug
     ~_Safe_iterator_base() { this->_M_detach(); }
 
     /** For use in _Safe_iterator. */
     ~_Safe_iterator_base() { this->_M_detach(); }
 
     /** For use in _Safe_iterator. */

-    __gnu_cxx::__mutex& _M_get_mutex();
+    __gnu_cxx::__mutex& _M_get_mutex() throw ();

 
   public:
     /** Attaches this iterator to the given sequence, detaching it
 
   public:
     /** Attaches this iterator to the given sequence, detaching it


@@ -116,7 +116,7 @@ namespace __gnu_debug
     void _M_attach(_Safe_sequence_base* __seq, bool __constant);
 
     /** Likewise, but not thread-safe. */
     void _M_attach(_Safe_sequence_base* __seq, bool __constant);
 
     /** Likewise, but not thread-safe. */

-    void _M_attach_single(_Safe_sequence_base* __seq, bool __constant);
+    void _M_attach_single(_Safe_sequence_base* __seq, bool __constant) throw ();

 
     /** Detach the iterator for whatever sequence it is attached to,
      * if any.
 
     /** Detach the iterator for whatever sequence it is attached to,
      * if any.


@@ -124,19 +124,19 @@ namespace __gnu_debug
     void _M_detach();
 
     /** Likewise, but not thread-safe. */
     void _M_detach();
 
     /** Likewise, but not thread-safe. */

-    void _M_detach_single();
+    void _M_detach_single() throw ();

 
     /** Determines if we are attached to the given sequence. */
     bool _M_attached_to(const _Safe_sequence_base* __seq) const
     { return _M_sequence == __seq; }
 
     /** Is this iterator singular? */
 
     /** Determines if we are attached to the given sequence. */
     bool _M_attached_to(const _Safe_sequence_base* __seq) const
     { return _M_sequence == __seq; }
 
     /** Is this iterator singular? */

-    bool _M_singular() const;
+    _GLIBCXX_PURE bool _M_singular() const throw ();

 
     /** Can we compare this iterator to the given iterator @p __x?
        Returns true if both iterators are nonsingular and reference
        the same sequence. */
 
     /** Can we compare this iterator to the given iterator @p __x?
        Returns true if both iterators are nonsingular and reference
        the same sequence. */

-    bool _M_can_compare(const _Safe_iterator_base& __x) const;
+    _GLIBCXX_PURE bool _M_can_compare(const _Safe_iterator_base& __x) const throw ();

   };
 
   /**
   };
 
   /**


@@ -207,7 +207,7 @@ namespace __gnu_debug
     _M_swap(_Safe_sequence_base& __x);
 
     /** For use in _Safe_sequence. */
     _M_swap(_Safe_sequence_base& __x);
 
     /** For use in _Safe_sequence. */

-    __gnu_cxx::__mutex& _M_get_mutex();
+    __gnu_cxx::__mutex& _M_get_mutex() throw ();

 
   public:
     /** Invalidates all iterators. */
 
   public:
     /** Invalidates all iterators. */

diff --git a/libstdc++-v3/include/ext/mt_allocator.h b/libstdc++-v3/include/ext/mt_allocator.h
index f03f3a6..fc31fe8 100644 (file)
--- a/libstdc++-v3/include/ext/mt_allocator.h
+++ b/libstdc++-v3/include/ext/mt_allocator.h
@@ -221,7 +221,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       _M_reserve_block(size_t __bytes, const size_t __thread_id);
     
       void
       _M_reserve_block(size_t __bytes, const size_t __thread_id);
     
       void

-      _M_reclaim_block(char* __p, size_t __bytes);
+      _M_reclaim_block(char* __p, size_t __bytes) throw ();

     
       size_t 
       _M_get_thread_id() { return 0; }
     
       size_t 
       _M_get_thread_id() { return 0; }


@@ -332,7 +332,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       _M_reserve_block(size_t __bytes, const size_t __thread_id);
     
       void
       _M_reserve_block(size_t __bytes, const size_t __thread_id);
     
       void

-      _M_reclaim_block(char* __p, size_t __bytes);
+      _M_reclaim_block(char* __p, size_t __bytes) throw ();

     
       const _Bin_record&
       _M_get_bin(size_t __which)
     
       const _Bin_record&
       _M_get_bin(size_t __which)


@@ -351,8 +351,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       }
 
       // XXX GLIBCXX_ABI Deprecated
       }
 
       // XXX GLIBCXX_ABI Deprecated

-      void 
-      _M_destroy_thread_key(void*);
+      _GLIBCXX_CONST void 
+      _M_destroy_thread_key(void*) throw ();

 
       size_t 
       _M_get_thread_id();
 
       size_t 
       _M_get_thread_id();

diff --git a/libstdc++-v3/include/ext/pool_allocator.h b/libstdc++-v3/include/ext/pool_allocator.h
index 87d145d..d7077b1 100644 (file)
--- a/libstdc++-v3/include/ext/pool_allocator.h
+++ b/libstdc++-v3/include/ext/pool_allocator.h
@@ -96,11 +96,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       _M_round_up(size_t __bytes)
       { return ((__bytes + (size_t)_S_align - 1) & ~((size_t)_S_align - 1)); }
       
       _M_round_up(size_t __bytes)
       { return ((__bytes + (size_t)_S_align - 1) & ~((size_t)_S_align - 1)); }
       

-      _Obj* volatile*
-      _M_get_free_list(size_t __bytes);
+      _GLIBCXX_CONST _Obj* volatile*
+      _M_get_free_list(size_t __bytes) throw ();

     
       __mutex&
     
       __mutex&

-      _M_get_mutex();
+      _M_get_mutex() throw ();

 
       // Returns an object of size __n, and optionally adds to size __n
       // free list.
 
       // Returns an object of size __n, and optionally adds to size __n
       // free list.

diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc
index c1e4ddd..6ce2e10 100644 (file)
--- a/libstdc++-v3/src/debug.cc
+++ b/libstdc++-v3/src/debug.cc
@@ -185,7 +185,7 @@ namespace __gnu_debug
 
   __gnu_cxx::__mutex&
   _Safe_sequence_base::
 
   __gnu_cxx::__mutex&
   _Safe_sequence_base::

-  _M_get_mutex()
+  _M_get_mutex() throw ()

   { return get_safe_base_mutex(); }
 
   void
   { return get_safe_base_mutex(); }
 
   void


@@ -198,7 +198,7 @@ namespace __gnu_debug
   
   void
   _Safe_iterator_base::
   
   void
   _Safe_iterator_base::

-  _M_attach_single(_Safe_sequence_base* __seq, bool __constant)
+  _M_attach_single(_Safe_sequence_base* __seq, bool __constant) throw ()

   {
     _M_detach_single();
     
   {
     _M_detach_single();
     


@@ -235,7 +235,7 @@ namespace __gnu_debug
 
   void
   _Safe_iterator_base::
 
   void
   _Safe_iterator_base::

-  _M_detach_single()
+  _M_detach_single() throw ()

   {
     if (_M_sequence)
       {
   {
     if (_M_sequence)
       {


@@ -259,12 +259,12 @@ namespace __gnu_debug
 
   bool
   _Safe_iterator_base::
 
   bool
   _Safe_iterator_base::

-  _M_singular() const
+  _M_singular() const throw ()

   { return !_M_sequence || _M_version != _M_sequence->_M_version; }
     
   bool
   _Safe_iterator_base::
   { return !_M_sequence || _M_version != _M_sequence->_M_version; }
     
   bool
   _Safe_iterator_base::

-  _M_can_compare(const _Safe_iterator_base& __x) const
+  _M_can_compare(const _Safe_iterator_base& __x) const throw ()

   {
     return (!_M_singular() 
            && !__x._M_singular() && _M_sequence == __x._M_sequence);
   {
     return (!_M_singular() 
            && !__x._M_singular() && _M_sequence == __x._M_sequence);


@@ -272,7 +272,7 @@ namespace __gnu_debug
 
   __gnu_cxx::__mutex&
   _Safe_iterator_base::
 
   __gnu_cxx::__mutex&
   _Safe_iterator_base::

-  _M_get_mutex()
+  _M_get_mutex() throw ()

   { return get_safe_base_mutex(); }
 
   void
   { return get_safe_base_mutex(); }
 
   void


@@ -471,7 +471,7 @@ namespace __gnu_debug
   }
 
   const _Error_formatter&
   }
 
   const _Error_formatter&

-  _Error_formatter::_M_message(_Debug_msg_id __id) const
+  _Error_formatter::_M_message(_Debug_msg_id __id) const throw ()

   { return this->_M_message(_S_debug_messages[__id]); }
   
   void
   { return this->_M_message(_S_debug_messages[__id]); }
   
   void


@@ -531,7 +531,7 @@ namespace __gnu_debug
     void
     _Error_formatter::_M_format_word(char* __buf, 
                                     int __n __attribute__ ((__unused__)), 
     void
     _Error_formatter::_M_format_word(char* __buf, 
                                     int __n __attribute__ ((__unused__)), 

-                                    const char* __fmt, _Tp __s) const
+                                    const char* __fmt, _Tp __s) const throw ()

     {
 #ifdef _GLIBCXX_USE_C99
       std::snprintf(__buf, __n, __fmt, __s);
     {
 #ifdef _GLIBCXX_USE_C99
       std::snprintf(__buf, __n, __fmt, __s);


@@ -674,7 +674,7 @@ namespace __gnu_debug
   }
 
   void
   }
 
   void

-  _Error_formatter::_M_get_max_length() const
+  _Error_formatter::_M_get_max_length() const throw ()

   {
     const char* __nptr = std::getenv("GLIBCXX_DEBUG_MESSAGE_LENGTH");
     if (__nptr)
   {
     const char* __nptr = std::getenv("GLIBCXX_DEBUG_MESSAGE_LENGTH");
     if (__nptr)

diff --git a/libstdc++-v3/src/mt_allocator.cc b/libstdc++-v3/src/mt_allocator.cc
index 95dc587..9c3af0e 100644 (file)
--- a/libstdc++-v3/src/mt_allocator.cc
+++ b/libstdc++-v3/src/mt_allocator.cc
@@ -108,7 +108,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
   }
 
   void
   }
 
   void

-  __pool<false>::_M_reclaim_block(char* __p, size_t __bytes)
+  __pool<false>::_M_reclaim_block(char* __p, size_t __bytes) throw ()

   {
     // Round up to power of 2 and figure out which bin to use.
     const size_t __which = _M_binmap[__bytes];
   {
     // Round up to power of 2 and figure out which bin to use.
     const size_t __which = _M_binmap[__bytes];


@@ -256,7 +256,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
   }
 
   void
   }
 
   void

-  __pool<true>::_M_reclaim_block(char* __p, size_t __bytes)
+  __pool<true>::_M_reclaim_block(char* __p, size_t __bytes) throw ()

   {
     // Round up to power of 2 and figure out which bin to use.
     const size_t __which = _M_binmap[__bytes];
   {
     // Round up to power of 2 and figure out which bin to use.
     const size_t __which = _M_binmap[__bytes];


@@ -649,7 +649,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
   // XXX GLIBCXX_ABI Deprecated
   void 
 
   // XXX GLIBCXX_ABI Deprecated
   void 

-  __pool<true>::_M_destroy_thread_key(void*) { }
+  __pool<true>::_M_destroy_thread_key(void*) throw () { }

 
   // XXX GLIBCXX_ABI Deprecated
   void
 
   // XXX GLIBCXX_ABI Deprecated
   void

diff --git a/libstdc++-v3/src/pool_allocator.cc b/libstdc++-v3/src/pool_allocator.cc
index cafd4d3..e0da5e7 100644 (file)
--- a/libstdc++-v3/src/pool_allocator.cc
+++ b/libstdc++-v3/src/pool_allocator.cc
@@ -44,14 +44,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
   // Definitions for __pool_alloc_base.
   __pool_alloc_base::_Obj* volatile*
 
   // Definitions for __pool_alloc_base.
   __pool_alloc_base::_Obj* volatile*

-  __pool_alloc_base::_M_get_free_list(size_t __bytes)
+  __pool_alloc_base::_M_get_free_list(size_t __bytes) throw ()

   { 
     size_t __i = ((__bytes + (size_t)_S_align - 1) / (size_t)_S_align - 1);
     return _S_free_list + __i;
   }
 
   __mutex&
   { 
     size_t __i = ((__bytes + (size_t)_S_align - 1) / (size_t)_S_align - 1);
     return _S_free_list + __i;
   }
 
   __mutex&

-  __pool_alloc_base::_M_get_mutex()
+  __pool_alloc_base::_M_get_mutex() throw ()

   { return get_palloc_mutex(); }
 
   // Allocate memory in large chunks in order to avoid fragmenting the
   { return get_palloc_mutex(); }
 
   // Allocate memory in large chunks in order to avoid fragmenting the