[Boost-commit] svn:boost r65401 - in sandbox/sync/boost/sync: . locks

Subject: [Boost-commit] svn:boost r65401 - in sandbox/sync/boost/sync: . locks
From: vicente.botet_at_[hidden]
Date: 2010-09-12 16:39:57

Author: viboes
Date: 2010-09-12 16:39:54 EDT (Sun, 12 Sep 2010)
New Revision: 65401
URL: http://svn.boost.org/trac/boost/changeset/65401

Log:
Moving lock_options.hpp to locks
Added:
   sandbox/sync/boost/sync/locks.hpp   (contents, props changed)
   sandbox/sync/boost/sync/locks/lock_options.hpp   (contents, props changed)
Removed:
   sandbox/sync/boost/sync/lock_options.hpp
Text files modified: 
   sandbox/sync/boost/sync/locks/lock_guard.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Deleted: sandbox/sync/boost/sync/lock_options.hpp
==============================================================================
--- sandbox/sync/boost/sync/lock_options.hpp	2010-09-12 16:39:54 EDT (Sun, 12 Sep 2010)
+++ (empty file)
@@ -1,52 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright 2007 Anthony Williams
-// (C) Copyright Ion Gaztanaga 2005-2009.
-// (C) Copyright Vicente J. Botet Escriba 2010. 
-// Distributed under the Boost Software License, Version 1.0. 
-// (See accompanying fileLICENSE_1_0.txt 
-// or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/sync for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef BOOST_SYNC_LOCK_OPTIONS_HPP
-#define BOOST_SYNC_LOCK_OPTIONS_HPP
-
-//~ #if (defined _MSC_VER) && (_MSC_VER >= 1200)
-//~ #  pragma once
-//~ #endif
-
-//~ #include <boost/sync/detail/config_begin.hpp>
-//~ #include <boost/sync/detail/workaround.hpp>
-
-//!\file
-//!Describes the lock options associated with lock constructors.
-
-namespace boost {
-
-//!Type to indicate to a mutex lock constructor that must not lock the mutex.
-struct defer_lock_t{};
-//!Type to indicate to a mutex lock constructor that must try to lock the mutex.
-struct try_to_lock_t {};
-//!Type to indicate to a mutex lock constructor that the mutex is already locked.
-struct adopt_lock_t{};
-
-//!An object indicating that the locking
-//!must be deferred.
-static const defer_lock_t      defer_lock      = {};
-
-//!An object indicating that a try_lock()
-//!operation must be executed.
-static const try_to_lock_t     try_to_lock    = {};
-
-//!An object indicating that the ownership of lockable
-//!object must be accepted by the new owner.
-static const adopt_lock_t  adopt_lock = {};
-
-} // namespace boost{
-
-//~ #include <boost/sync/detail/config_end.hpp>
-
-#endif // BOOST_SYNC_LOCK_OPTIONS_HPP

Added: sandbox/sync/boost/sync/locks.hpp
==============================================================================
--- (empty file)
+++ sandbox/sync/boost/sync/locks.hpp	2010-09-12 16:39:54 EDT (Sun, 12 Sep 2010)
@@ -0,0 +1,20 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// (C) Copyright 2007 Anthony Williams
+// (C) Copyright Ion Gaztanaga 2005-2009.
+// (C) Copyright Vicente J. Botet Escriba 2010. 
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying fileLICENSE_1_0.txt 
+// or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/sync for documentation.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef BOOST_SYNC_LOCKS_HPP
+#define BOOST_SYNC_LOCKS_HPP
+
+#include <boost/sync/locks/lock_options.hpp>
+#include <boost/sync/locks/lock_guard.hpp>
+
+#endif // BOOST_SYNC_LOCK_OPTIONS_HPP

Modified: sandbox/sync/boost/sync/locks/lock_guard.hpp
==============================================================================
--- sandbox/sync/boost/sync/locks/lock_guard.hpp	(original)
+++ sandbox/sync/boost/sync/locks/lock_guard.hpp	2010-09-12 16:39:54 EDT (Sun, 12 Sep 2010)
@@ -13,7 +13,7 @@
 #ifndef BOOST_SYNC_LOCK_GUARD_HPP
 #define BOOST_SYNC_LOCK_GUARD_HPP
 
-#include <boost/sync/lock_options.hpp>
+#include <boost/sync/locks/lock_options.hpp>
 
 namespace boost {
 

Added: sandbox/sync/boost/sync/locks/lock_options.hpp
==============================================================================
--- (empty file)
+++ sandbox/sync/boost/sync/locks/lock_options.hpp	2010-09-12 16:39:54 EDT (Sun, 12 Sep 2010)
@@ -0,0 +1,52 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// (C) Copyright 2007 Anthony Williams
+// (C) Copyright Ion Gaztanaga 2005-2009.
+// (C) Copyright Vicente J. Botet Escriba 2010. 
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying fileLICENSE_1_0.txt 
+// or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/sync for documentation.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef BOOST_SYNC_LOCK_OPTIONS_HPP
+#define BOOST_SYNC_LOCK_OPTIONS_HPP
+
+//~ #if (defined _MSC_VER) && (_MSC_VER >= 1200)
+//~ #  pragma once
+//~ #endif
+
+//~ #include <boost/sync/detail/config_begin.hpp>
+//~ #include <boost/sync/detail/workaround.hpp>
+
+//!\file
+//!Describes the lock options associated with lock constructors.
+
+namespace boost {
+
+//!Type to indicate to a mutex lock constructor that must not lock the mutex.
+struct defer_lock_t{};
+//!Type to indicate to a mutex lock constructor that must try to lock the mutex.
+struct try_to_lock_t {};
+//!Type to indicate to a mutex lock constructor that the mutex is already locked.
+struct adopt_lock_t{};
+
+//!An object indicating that the locking
+//!must be deferred.
+static const defer_lock_t      defer_lock      = {};
+
+//!An object indicating that a try_lock()
+//!operation must be executed.
+static const try_to_lock_t     try_to_lock    = {};
+
+//!An object indicating that the ownership of lockable
+//!object must be accepted by the new owner.
+static const adopt_lock_t  adopt_lock = {};
+
+} // namespace boost{
+
+//~ #include <boost/sync/detail/config_end.hpp>
+
+#endif // BOOST_SYNC_LOCK_OPTIONS_HPP