diff options
Diffstat (limited to 'boost/interprocess/sync/upgradable_lock.hpp')
| -rw-r--r-- | boost/interprocess/sync/upgradable_lock.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/boost/interprocess/sync/upgradable_lock.hpp b/boost/interprocess/sync/upgradable_lock.hpp index fb86374ca1..646019b433 100644 --- a/boost/interprocess/sync/upgradable_lock.hpp +++ b/boost/interprocess/sync/upgradable_lock.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) // @@ -16,7 +16,7 @@ #ifndef BOOST_INTERPROCESS_UPGRADABLE_LOCK_HPP #define BOOST_INTERPROCESS_UPGRADABLE_LOCK_HPP -#if (defined _MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma once #endif @@ -28,7 +28,7 @@ #include <boost/interprocess/detail/type_traits.hpp> #include <boost/interprocess/exceptions.hpp> -#include <boost/move/move.hpp> +#include <boost/move/utility_core.hpp> #include <boost/interprocess/detail/posix_time_types_wrk.hpp> //!\file @@ -52,13 +52,13 @@ class upgradable_lock { public: typedef UpgradableMutex mutex_type; - /// @cond + #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) private: typedef upgradable_lock<UpgradableMutex> this_type; explicit upgradable_lock(scoped_lock<mutex_type>&); typedef bool this_type::*unspecified_bool_type; BOOST_MOVABLE_BUT_NOT_COPYABLE(upgradable_lock) - /// @endcond + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED public: //!Effects: Default constructs a upgradable_lock. @@ -207,7 +207,7 @@ class upgradable_lock //!Notes: The sharable_lock changes from a state of not owning the mutex, //! to owning the mutex, blocking if necessary. void lock() - { + { if(!mp_mutex || m_locked) throw lock_exception(); mp_mutex->lock_upgradable(); @@ -223,7 +223,7 @@ class upgradable_lock //! mutex_type does not support try_lock_upgradable(), this function will //! fail at compile time if instantiated, but otherwise have no effect. bool try_lock() - { + { if(!mp_mutex || m_locked) throw lock_exception(); m_locked = mp_mutex->try_lock_upgradable(); @@ -240,7 +240,7 @@ class upgradable_lock //! timed_lock_upgradable(abs_time), this function will fail at compile //! time if instantiated, but otherwise have no effect. bool timed_lock(const boost::posix_time::ptime& abs_time) - { + { if(!mp_mutex || m_locked) throw lock_exception(); m_locked = mp_mutex->timed_lock_upgradable(abs_time); @@ -294,11 +294,11 @@ class upgradable_lock std::swap(m_locked, other.m_locked); } - /// @cond + #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) private: mutex_type *mp_mutex; bool m_locked; - /// @endcond + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED }; } // namespace interprocess |