diff options
Diffstat (limited to 'boost/interprocess/sync/posix/named_mutex.hpp')
| -rw-r--r-- | boost/interprocess/sync/posix/named_mutex.hpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/boost/interprocess/sync/posix/named_mutex.hpp b/boost/interprocess/sync/posix/named_mutex.hpp index 931c731eff..2b3be2f8be 100644 --- a/boost/interprocess/sync/posix/named_mutex.hpp +++ b/boost/interprocess/sync/posix/named_mutex.hpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////////// // -// (C) Copyright Ion Gaztanaga 2005-2011. Distributed under the Boost +// (C) Copyright Ion Gaztanaga 2005-2012. 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) // @@ -11,7 +11,7 @@ #ifndef BOOST_INTERPROCESS_POSIX_NAMED_MUTEX_HPP #define BOOST_INTERPROCESS_POSIX_NAMED_MUTEX_HPP -#if (defined _MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma once #endif @@ -32,13 +32,13 @@ class named_condition; class posix_named_mutex { - /// @cond + #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) posix_named_mutex(); posix_named_mutex(const posix_named_mutex &); posix_named_mutex &operator=(const posix_named_mutex &); friend class named_condition; - /// @endcond + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED public: posix_named_mutex(create_only_t create_only, const char *name, const permissions &perm = permissions()); @@ -55,16 +55,16 @@ class posix_named_mutex bool timed_lock(const boost::posix_time::ptime &abs_time); static bool remove(const char *name); - /// @cond + #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) private: friend class interprocess_tester; void dont_close_on_destruction(); posix_named_semaphore m_sem; - /// @endcond + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED }; -/// @cond +#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) inline posix_named_mutex::posix_named_mutex(create_only_t, const char *name, const permissions &perm) : m_sem(create_only, name, 1, perm) @@ -94,18 +94,12 @@ inline bool posix_named_mutex::try_lock() { return m_sem.try_wait(); } inline bool posix_named_mutex::timed_lock(const boost::posix_time::ptime &abs_time) -{ - if(abs_time == boost::posix_time::pos_infin){ - this->lock(); - return true; - } - return m_sem.timed_wait(abs_time); -} +{ return m_sem.timed_wait(abs_time); } inline bool posix_named_mutex::remove(const char *name) { return posix_named_semaphore::remove(name); } -/// @endcond +#endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED } //namespace ipcdetail { } //namespace interprocess { |