Commit a2a9e24d authored by haikuo zhang's avatar haikuo zhang

[1680] remove codes which should be build in --enable-boost-threads

switch. the codes are in src/lib/util/locks.h
parent 9c4d0cad
...@@ -15,13 +15,9 @@ ...@@ -15,13 +15,9 @@
/// This file (right now) provides dummy locks /// This file (right now) provides dummy locks
/// It also contains code to use boost/threads locks: /// It also contains code to use boost/threads locks:
/// ///
/// if USE_BOOST_THREADS is defined, we typedef the relevant classes
/// and derive from the relevant templates so our dummy locks are
/// replaced by the boost locks (--enable-boost-threads)
/// ///
/// If USE_BOOST_THREADS is NOT defined, all locks are dummy classes /// All locks are dummy classes that don't actually do anything. At this moment,
/// that don't actually do anything. At this moment, only the very /// only the very minimal set of methods that we actually use is defined.
/// minimal set of methods that we actually use is defined.
/// ///
/// Note that we need to include <config.h> in our .cc files for that /// Note that we need to include <config.h> in our .cc files for that
/// to be set. we might want to enfore this at compile time with a check /// to be set. we might want to enfore this at compile time with a check
...@@ -30,8 +26,6 @@ ...@@ -30,8 +26,6 @@
#ifndef __LOCKS_ #ifndef __LOCKS_
#define __LOCKS_ #define __LOCKS_
#ifndef USE_BOOST_THREADS
namespace isc { namespace isc {
namespace util { namespace util {
namespace locks { namespace locks {
...@@ -64,52 +58,4 @@ public: ...@@ -64,52 +58,4 @@ public:
} // namespace util } // namespace util
} // namespace isc } // namespace isc
#else // USE_BOOST_THREADS
// Workaround for a problem with boost and sunstudio 5.10
// There is a version check in there that appears wrong,
// which makes including boost/thread.hpp fail
// This will probably be fixed in a future version of boost,
// in which case this part can be removed then
#ifdef NEED_SUNPRO_WORKAROUND
#if defined(__SUNPRO_CC) && __SUNPRO_CC == 0x5100
#undef __SUNPRO_CC
#define __SUNPRO_CC 0x5090
#endif
#endif // NEED_SUNPRO_WORKAROUND
#include <boost/thread.hpp>
#include <boost/interprocess/sync/sharable_lock.hpp>
#include <boost/interprocess/sync/scoped_lock.hpp>
#include <boost/interprocess/sync/interprocess_upgradable_mutex.hpp>
#include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
namespace isc {
namespace util {
namespace locks {
typedef boost::mutex mutex;
typedef boost::interprocess::interprocess_upgradable_mutex upgradable_mutex;
typedef boost::interprocess::interprocess_recursive_mutex recursive_mutex;
template <typename T>
struct sharable_lock : public boost::interprocess::sharable_lock<T> {
public:
sharable_lock(T& mtype) : boost::interprocess::sharable_lock<T>(mtype) {}
};
template <class T>
struct scoped_lock : public boost::interprocess::scoped_lock<T> {
public:
scoped_lock(T& mtype) : boost::interprocess::scoped_lock<T>(mtype) { }
};
} // namespace locks
} // namespace util
} // namespace isc
#endif // USE_BOOST_THREADS
#endif // __LOCKS_ #endif // __LOCKS_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment