diff options
| author | Eric Milkie <milkie@10gen.com> | 2012-04-02 14:55:19 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2012-04-02 14:59:48 -0400 |
| commit | 45f30389a9128fe2216371cabbe8426b634d68e9 (patch) | |
| tree | a3f0fc2b758e58c0ec61a27110f1e7b26f034f76 /src/mongo/util/concurrency/mutex.h | |
| parent | 8b1c9bd361bd002980266c5269e5eab4ba62a7f5 (diff) | |
| download | mongo-45f30389a9128fe2216371cabbe8426b634d68e9.tar.gz | |
SERVER-5348 make dbclient.h the main C++ driver include file
This change fixes some #defines of common C functions so that their
definitions do not leak into consumer code.
I also had to change Labeler SIZE because it conflicts with Windows
SIZE.
pch.h is on its way out, but for now it's hanging around.
Diffstat (limited to 'src/mongo/util/concurrency/mutex.h')
| -rw-r--r-- | src/mongo/util/concurrency/mutex.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mongo/util/concurrency/mutex.h b/src/mongo/util/concurrency/mutex.h index 4ae6c78c9c6..4adf2c85b09 100644 --- a/src/mongo/util/concurrency/mutex.h +++ b/src/mongo/util/concurrency/mutex.h @@ -71,11 +71,7 @@ namespace mongo { public: try_lock( mongo::mutex &m , int millis = 0 ) : _l( m.boost() , incxtimemillis( millis ) ) , -#if BOOST_VERSION >= 103500 ok( _l.owns_lock() ) -#else - ok( _l.locked() ) -#endif { } private: boost::timed_mutex::scoped_timed_lock _l; |