← Back to branch summary

~ubuntu-branches/ubuntu/wily/ruby-passenger/wily-proposed

« back to all changes in this revision

Viewing changes to ext/common/Utils/Lock.h

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-11-23 23:50:02 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20131123235002-8fdhsq7afj15o2z2
Tags: 4.0.25-1
http://bugs.debian.org/725591
* New upstream release.
* Refresh fix_install_path.patch.
* Build for Ruby 2.0 instead of 1.8. (Closes: #725591)
* Add fix_ftbfs_fortify_source.patch.
* Install passenger template files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/common/Utils/Lock.h
12
12
typedef boost::unique_lock<boost::mutex> ScopedLock;
13
13
 
14
14
/** Nicer syntax for conditionally locking the mutex during construction. */
15
 
class DynamicScopedLock: public unique_lock<boost::mutex> {
 
15
class DynamicScopedLock: public boost::unique_lock<boost::mutex> {
16
16
public:
17
17
        DynamicScopedLock(boost::mutex &m, bool lockNow = true)
18
 
                : unique_lock<boost::mutex>(m, defer_lock)
 
18
                : boost::unique_lock<boost::mutex>(m, boost::defer_lock)
19
19
        {
20
20
                if (lockNow) {
21
21
                        lock();