2011-11-18 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / condition_variable.cc

diff --git a/libstdc++-v3/src/condition_variable.cc b/libstdc++-v3/src/condition_variable.cc
index f1ae33a..400fcf3 100644 (file)
--- a/libstdc++-v3/src/condition_variable.cc
+++ b/libstdc++-v3/src/condition_variable.cc
@@ -1,11 +1,11 @@
-// mutex -*- C++ -*-
+// condition_variable -*- C++ -*-
 
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -13,45 +13,42 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 #include <condition_variable>
 
 #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
 
-namespace std
+namespace std _GLIBCXX_VISIBILITY(default)
 {
-  condition_variable::condition_variable()
-  {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 #ifdef __GTHREAD_COND_INIT
-    __gthread_cond_t __tmp = __GTHREAD_COND_INIT;
-    _M_cond = __tmp;
+  condition_variable::condition_variable() noexcept = default;
+  condition_variable::~condition_variable() noexcept = default;
 #else
-    int __e = __gthread_cond_init(&_M_cond, NULL);
+  condition_variable::condition_variable() noexcept
+  {
+    int __e = __gthread_cond_init(&_M_cond, 0);
 
     if (__e)
       __throw_system_error(__e);
-#endif
   }
 
-  condition_variable::~condition_variable()
+  condition_variable::~condition_variable() noexcept
   {
     // XXX no thread blocked
     /* int __e = */ __gthread_cond_destroy(&_M_cond);
     // if __e == EBUSY then blocked
   }
+#endif
 
   void
   condition_variable::wait(unique_lock<mutex>& __lock)
@@ -59,13 +56,12 @@ namespace std
     int __e = __gthread_cond_wait(&_M_cond, __lock.mutex()->native_handle());
 
     if (__e)
-      __throw_system_error(__e);    
+      __throw_system_error(__e);
   }
-  
-  void 
-  condition_variable::notify_one()
-  { 
-    lock_guard<mutex> __lock(_M_internal_mutex);
+
+  void
+  condition_variable::notify_one() noexcept
+  {
     int __e = __gthread_cond_signal(&_M_cond);
 
     // XXX not in spec
@@ -74,10 +70,9 @@ namespace std
       __throw_system_error(__e);
   }
 
-  void 
-  condition_variable::notify_all()
-  { 
-    lock_guard<mutex> __lock(_M_internal_mutex);
+  void
+  condition_variable::notify_all() noexcept
+  {
     int __e = __gthread_cond_broadcast(&_M_cond);
 
     // XXX not in spec
@@ -86,23 +81,11 @@ namespace std
       __throw_system_error(__e);
   }
 
-  condition_variable_any::condition_variable_any()
-  {
-#ifdef __GTHREAD_COND_INIT
-    __gthread_cond_t __tmp = __GTHREAD_COND_INIT;
-    _M_cond = __tmp;
-#else
-    int __e = __gthread_cond_init(&_M_cond, NULL);
+  condition_variable_any::condition_variable_any() noexcept = default;
 
-    if (__e)
-      __throw_system_error(__e);
-#endif
-  }
-  
-  condition_variable_any::~condition_variable_any()
-  {
-    __gthread_cond_destroy(&_M_cond);
-  } 
-}
+  condition_variable_any::~condition_variable_any() noexcept = default;
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
 
 #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1