diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-02-21 19:24:51 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-02-21 19:24:51 +0000 |
| commit | 9dcfc2fdc58bf46a434f9c228a828be8d580f529 (patch) | |
| tree | 813cb43dbcebfa4bdff60b83f82235c92b22f028 /src/util/channel.h | |
| parent | 3baf3bde60c118468b6af869942a9d9a7e3fb3d6 (diff) | |
don't require libboost_thread (its presence is detected at configure-time), and other build/documentation fixes from yesterday's portfolio merge; resolves bug 302
Diffstat (limited to 'src/util/channel.h')
| -rw-r--r-- | src/util/channel.h | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/src/util/channel.h b/src/util/channel.h index 1701feba9..eae7a4f11 100644 --- a/src/util/channel.h +++ b/src/util/channel.h @@ -1,3 +1,21 @@ +/********************* */ +/*! \file channel.h + ** \verbatim + ** Original author: kshitij + ** Major contributors: none + ** Minor contributors (to current version): none + ** This file is part of the CVC4 prototype. + ** Copyright (c) 2009-2012 The Analysis of Computer Systems Group (ACSys) + ** Courant Institute of Mathematical Sciences + ** New York University + ** See the file COPYING in the top-level source directory for licensing + ** information.\endverbatim + ** + ** \brief [[ Add one-line brief description here ]] + ** + ** [[ Add lengthier description here ]] + ** \todo document this file + **/ #ifndef __CVC4__CHANNEL_H #define __CVC4__CHANNEL_H @@ -10,7 +28,6 @@ #include <boost/progress.hpp> #include <boost/bind.hpp> - namespace CVC4 { template <typename T> @@ -32,15 +49,17 @@ public: /* */ virtual bool full() = 0; -}; +};/* class SharedChannel<T> */ /* This code is from -http://live.boost.org/doc/libs/1_46_1/libs/circular_buffer/doc/circular_buffer.html#boundedbuffer +http://live.boost.org/doc/libs/1_46_1/libs/circular_buffer/doc/circular_buffer.html#boundedbuffer + +and is covered by the Boost Software License, version 1.0. */ template <typename T> -class SynchronizedSharedChannel: public SharedChannel<T> { +class SynchronizedSharedChannel : public SharedChannel<T> { public: typedef boost::circular_buffer<T> container_type; typedef typename container_type::size_type size_type; @@ -87,10 +106,8 @@ private: boost::mutex m_mutex; boost::condition m_not_empty; boost::condition m_not_full; -}; +};/* class SynchronizedSharedChannel<T> */ } #endif /* __CVC4__CHANNEL_H */ - - |