|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49005 - in sandbox/thread_safe_signals/trunk/boost/signals2: . detail
From: fmhess_at_[hidden]
Date: 2008-09-29 11:13:24
Author: fmhess
Date: 2008-09-29 11:13:23 EDT (Mon, 29 Sep 2008)
New Revision: 49005
URL: http://svn.boost.org/trac/boost/changeset/49005
Log:
Renamed signals2::lightweight_mutex to signals2::mutex.
Added:
sandbox/thread_safe_signals/trunk/boost/signals2/mutex.hpp
- copied, changed from r48979, /sandbox/thread_safe_signals/trunk/boost/signals2/lightweight_mutex.hpp
Removed:
sandbox/thread_safe_signals/trunk/boost/signals2/lightweight_mutex.hpp
Text files modified:
sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_nop.hpp | 2 +-
sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_pthreads.hpp | 10 +++++-----
sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_win32_cs.hpp | 10 +++++-----
sandbox/thread_safe_signals/trunk/boost/signals2/detail/signal_template.hpp | 2 +-
sandbox/thread_safe_signals/trunk/boost/signals2/mutex.hpp | 10 +++++-----
sandbox/thread_safe_signals/trunk/boost/signals2/signal.hpp | 4 ++--
6 files changed, 19 insertions(+), 19 deletions(-)
Modified: sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_nop.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_nop.hpp (original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_nop.hpp 2008-09-29 11:13:23 EDT (Mon, 29 Sep 2008)
@@ -26,7 +26,7 @@
namespace signals2
{
-class lightweight_mutex: public dummy_mutex
+class mutex: public dummy_mutex
{
};
Modified: sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_pthreads.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_pthreads.hpp (original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_pthreads.hpp 2008-09-29 11:13:23 EDT (Mon, 29 Sep 2008)
@@ -26,18 +26,18 @@
namespace signals2
{
-class lightweight_mutex
+class mutex
{
private:
pthread_mutex_t m_;
- lightweight_mutex(lightweight_mutex const &);
- lightweight_mutex & operator=(lightweight_mutex const &);
+ mutex(mutex const &);
+ mutex & operator=(mutex const &);
public:
- lightweight_mutex()
+ mutex()
{
// HPUX 10.20 / DCE has a nonstandard pthread_mutex_init
@@ -49,7 +49,7 @@
#endif
}
- ~lightweight_mutex()
+ ~mutex()
{
pthread_mutex_destroy(&m_);
}
Modified: sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_win32_cs.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_win32_cs.hpp (original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/detail/lwm_win32_cs.hpp 2008-09-29 11:13:23 EDT (Mon, 29 Sep 2008)
@@ -55,23 +55,23 @@
#endif // #ifndef BOOST_USE_WINDOWS_H
-class lightweight_mutex
+class mutex
{
private:
critical_section cs_;
- lightweight_mutex(lightweight_mutex const &);
- lightweight_mutex & operator=(lightweight_mutex const &);
+ mutex(mutex const &);
+ mutex & operator=(mutex const &);
public:
- lightweight_mutex()
+ mutex()
{
InitializeCriticalSection(&cs_);
}
- ~lightweight_mutex()
+ ~mutex()
{
DeleteCriticalSection(&cs_);
}
Modified: sandbox/thread_safe_signals/trunk/boost/signals2/detail/signal_template.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/detail/signal_template.hpp (original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/detail/signal_template.hpp 2008-09-29 11:13:23 EDT (Mon, 29 Sep 2008)
@@ -25,7 +25,7 @@
typename Group = int, \
typename GroupCompare = std::less<Group>, \
typename SlotFunction = BOOST_FUNCTION_N_DECL(BOOST_SIGNALS_NUM_ARGS), \
- typename Mutex = signals2::lightweight_mutex
+ typename Mutex = signals2::mutex
// typename R, typename T1, typename T2, ..., typename TN, typename Combiner, ...
#define BOOST_SIGNAL_TEMPLATE_DECL \
BOOST_SIGNAL_SIGNATURE_TEMPLATE_DECL(BOOST_SIGNALS_NUM_ARGS), \
Deleted: sandbox/thread_safe_signals/trunk/boost/signals2/lightweight_mutex.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/lightweight_mutex.hpp 2008-09-29 11:13:23 EDT (Mon, 29 Sep 2008)
+++ (empty file)
@@ -1,38 +0,0 @@
-#ifndef BOOST_SIGNALS2_LIGHTWEIGHT_MUTEX_HPP_INCLUDED
-#define BOOST_SIGNALS2_LIGHTWEIGHT_MUTEX_HPP_INCLUDED
-
-// MS compatible compilers support #pragma once
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-//
-// boost/signals2/lightweight_mutex.hpp - lightweight mutex
-//
-// Copyright (c) 2002, 2003 Peter Dimov and Multi Media Ltd.
-// Copyright (c) 2008 Frank Mori Hess
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// boost::signals2::lightweight_mutex is a modification of
-// boost::detail::lightweight_mutex to follow the newer Lockable
-// concept of Boost.Thread.
-//
-
-#include <boost/config.hpp>
-
-#if !defined(BOOST_HAS_THREADS)
-# include <boost/signals2/detail/lwm_nop.hpp>
-#elif defined(BOOST_HAS_PTHREADS)
-# include <boost/signals2/detail/lwm_pthreads.hpp>
-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
-# include <boost/signals2/detail/lwm_win32_cs.hpp>
-#else
-// Use #define BOOST_DISABLE_THREADS to avoid the error
-# error Unrecognized threading platform
-#endif
-
-#endif // #ifndef BOOST_SIGNALS2_LIGHTWEIGHT_MUTEX_HPP_INCLUDED
Copied: sandbox/thread_safe_signals/trunk/boost/signals2/mutex.hpp (from r48979, /sandbox/thread_safe_signals/trunk/boost/signals2/lightweight_mutex.hpp)
==============================================================================
--- /sandbox/thread_safe_signals/trunk/boost/signals2/lightweight_mutex.hpp (original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/mutex.hpp 2008-09-29 11:13:23 EDT (Mon, 29 Sep 2008)
@@ -1,5 +1,5 @@
-#ifndef BOOST_SIGNALS2_LIGHTWEIGHT_MUTEX_HPP_INCLUDED
-#define BOOST_SIGNALS2_LIGHTWEIGHT_MUTEX_HPP_INCLUDED
+#ifndef BOOST_SIGNALS2_MUTEX_HPP_INCLUDED
+#define BOOST_SIGNALS2_MUTEX_HPP_INCLUDED
// MS compatible compilers support #pragma once
@@ -8,7 +8,7 @@
#endif
//
-// boost/signals2/lightweight_mutex.hpp - lightweight mutex
+// boost/signals2/mutex.hpp - header-only mutex
//
// Copyright (c) 2002, 2003 Peter Dimov and Multi Media Ltd.
// Copyright (c) 2008 Frank Mori Hess
@@ -17,7 +17,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
-// boost::signals2::lightweight_mutex is a modification of
+// boost::signals2::mutex is a modification of
// boost::detail::lightweight_mutex to follow the newer Lockable
// concept of Boost.Thread.
//
@@ -35,4 +35,4 @@
# error Unrecognized threading platform
#endif
-#endif // #ifndef BOOST_SIGNALS2_LIGHTWEIGHT_MUTEX_HPP_INCLUDED
+#endif // #ifndef BOOST_SIGNALS2_MUTEX_HPP_INCLUDED
Modified: sandbox/thread_safe_signals/trunk/boost/signals2/signal.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/signal.hpp (original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/signal.hpp 2008-09-29 11:13:23 EDT (Mon, 29 Sep 2008)
@@ -31,7 +31,7 @@
#include <boost/signals2/detail/signals_common_macros.hpp>
#include <boost/signals2/detail/slot_groups.hpp>
#include <boost/signals2/detail/slot_call_iterator.hpp>
-#include <boost/signals2/lightweight_mutex.hpp>
+#include <boost/signals2/mutex.hpp>
#include <boost/signals2/connection.hpp>
#include <boost/signals2/shared_connection_block.hpp>
#include <boost/signals2/slot.hpp>
@@ -50,7 +50,7 @@
typename Group = int,
typename GroupCompare = std::less<Group>,
typename SlotFunction = function<Signature>,
- typename Mutex = lightweight_mutex >
+ typename Mutex = mutex >
class signal: public detail::signalN<function_traits<Signature>::arity,
Signature, Combiner, Group, GroupCompare, SlotFunction, Mutex>::type
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk