From: anthony_at_[hidden]
Date: 2007-10-05 05:55:12
Author: anthonyw
Date: 2007-10-05 05:55:12 EDT (Fri, 05 Oct 2007)
New Revision: 39696
URL: http://svn.boost.org/trac/boost/changeset/39696
Log:
reverted condition.hpp
Text files modified:
branches/thread_rewrite/boost/boost/thread/condition.hpp | 59 ++++++---------------------------------
1 files changed, 9 insertions(+), 50 deletions(-)
Modified: branches/thread_rewrite/boost/boost/thread/condition.hpp
==============================================================================
--- branches/thread_rewrite/boost/boost/thread/condition.hpp (original)
+++ branches/thread_rewrite/boost/boost/thread/condition.hpp 2007-10-05 05:55:12 EDT (Fri, 05 Oct 2007)
@@ -1,57 +1,16 @@
-#ifndef BOOST_THREAD_CONDITION_HPP
-#define BOOST_THREAD_CONDITION_HPP
+// Copyright 2006 Roland Schwarz.
// 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)
-// (C) Copyright 2007 Anthony Williams
+//
+// This work is a reimplementation along the design and ideas
+// of William E. Kempf.
-#include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(condition_state.hpp)
-
-namespace boost
-{
- template <class Mutex>
- class condition:
- private boost::detail::thread::condition_state<Mutex>
- {
- public:
- typedef Mutex mutex_type;
-
- condition();
- explicit condition(mutex_type& m);
- ~condition();
-
-#ifdef BOOST_HAS_DELETED_FUNCTIONS
- condition(const condition&) = delete;
- condition& operator=(const condition&) = delete;
-#endif
-
- void notify_one();
- void notify_all();
-
- template <class Lock>
- void wait(Lock& lock);
-
- template <class Lock, class Predicate>
- void wait(Lock& lock, Predicate pred);
+#ifndef BOOST_THREAD_RS06040706_HPP
+#define BOOST_THREAD_RS06040706_HPP
- template <class Lock>
- bool timed_wait(Lock& lock, const utc_time& abs_time);
-
- template <class Lock, class Predicate>
- bool timed_wait(Lock& lock, const utc_time& abs_time, Predicate pred);
-
-#ifndef BOOST_HAS_DELETED_FUNCTIONS
- private:
- explicit condition(condition&);
- condition& operator=(condition&);
-#endif
-
- };
-}
-
-#include BOOST_THREAD_PLATFORM(condition_impl.hpp)
-#include <boost/thread/utc_time.hpp>
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(condition.hpp)
-#endif
+#endif // BOOST_THREAD_RS06040706_HPP