github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change oak::mutex_t → std::mutex (C++11)

Browse Source
This commit is contained in:
Allan Odgaard
2013-03-13 12:37:21 +01:00
parent f0efe600e4
commit c3e9fc1b0e
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Frameworks/HTMLOutput/src/HTMLOutput.mm
View File

@@ -1,7 +1,6 @@
#import "HTMLOutput.h"
#import <OakSystem/process.h>
#import <command/runner.h>
#import <oak/lock.h>
#import <oak/server.h>
#import <oak/debug.h>
@@ -15,7 +14,7 @@ namespace
int add_process (pid_t processId)
{
oak::lock_t lock = _lock();
std::lock_guard<std::mutex> lock(_lock);
std::vector<int> toDelete;
iterate(record, _records)
@@ -32,7 +31,7 @@ namespace
void output (int key, char const* data, size_t len)
{
oak::lock_t lock = _lock();
std::lock_guard<std::mutex> lock(_lock);
if(record_t* record = find(key))
{
if(record->protocol)
@@ -43,7 +42,7 @@ namespace
void done (int key)
{
oak::lock_t lock = _lock();
std::lock_guard<std::mutex> lock(_lock);
if(record_t* record = find(key))
{
record->process_id = 0;
@@ -56,7 +55,7 @@ namespace
void start (int key, NSURLProtocol* protocol)
{
oak::lock_t lock = _lock();
std::lock_guard<std::mutex> lock(_lock);
if(record_t* record = find(key))
{
@@ -74,7 +73,7 @@ namespace
void stop (int key)
{
oak::lock_t lock = _lock();
std::lock_guard<std::mutex> lock(_lock);
if(record_t* record = find(key))
{
record->protocol = NULL;
@@ -103,7 +102,7 @@ namespace
int _next_key;
std::map<int, record_t> _records;
oak::mutex_t _lock;
std::mutex _lock;
};
runners_t& runners ()