Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
72bc51ee
Commit
72bc51ee
authored
Feb 12, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Подправил объявления mutex-ов (в соответсвии с c++11)
parent
0d42089b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
36 deletions
+8
-36
Mutex.h
include/Mutex.h
+8
-8
Mutex.cc
src/Various/Mutex.cc
+0
-28
No files found.
include/Mutex.h
View file @
72bc51ee
...
...
@@ -52,8 +52,8 @@ namespace UniSetTypes
private
:
friend
class
uniset_mutex_lock
;
uniset_mutex
(
const
uniset_mutex
&
r
);
const
uniset_mutex
&
operator
=
(
const
uniset_mutex
&
r
);
uniset_mutex
(
const
uniset_mutex
&
r
)
=
delete
;
const
uniset_mutex
&
operator
=
(
const
uniset_mutex
&
r
)
=
delete
;
std
::
string
nm
;
std
::
timed_mutex
m_lock
;
};
...
...
@@ -80,8 +80,8 @@ namespace UniSetTypes
uniset_mutex
*
mutex
;
std
::
atomic
<
int
>
locked
;
uniset_mutex_lock
(
const
uniset_mutex_lock
&
);
uniset_mutex_lock
&
operator
=
(
const
uniset_mutex_lock
&
);
uniset_mutex_lock
(
const
uniset_mutex_lock
&
)
=
delete
;
uniset_mutex_lock
&
operator
=
(
const
uniset_mutex_lock
&
)
=
delete
;
};
// -------------------------------------------------------------------------
...
...
@@ -126,8 +126,8 @@ namespace UniSetTypes
~
uniset_rwmutex_wrlock
();
private
:
uniset_rwmutex_wrlock
(
const
uniset_rwmutex_wrlock
&
);
uniset_rwmutex_wrlock
&
operator
=
(
const
uniset_rwmutex_wrlock
&
);
uniset_rwmutex_wrlock
(
const
uniset_rwmutex_wrlock
&
)
=
delete
;
uniset_rwmutex_wrlock
&
operator
=
(
const
uniset_rwmutex_wrlock
&
)
=
delete
;
uniset_rwmutex
&
m
;
};
...
...
@@ -138,8 +138,8 @@ namespace UniSetTypes
~
uniset_rwmutex_rlock
();
private
:
uniset_rwmutex_rlock
(
const
uniset_rwmutex_rlock
&
);
uniset_rwmutex_rlock
&
operator
=
(
const
uniset_rwmutex_rlock
&
);
uniset_rwmutex_rlock
(
const
uniset_rwmutex_rlock
&
)
=
delete
;
uniset_rwmutex_rlock
&
operator
=
(
const
uniset_rwmutex_rlock
&
)
=
delete
;
uniset_rwmutex
&
m
;
};
// -------------------------------------------------------------------------
...
...
src/Various/Mutex.cc
View file @
72bc51ee
...
...
@@ -213,20 +213,6 @@ uniset_rwmutex_wrlock::~uniset_rwmutex_wrlock()
{
m
.
unlock
();
}
uniset_rwmutex_wrlock
::
uniset_rwmutex_wrlock
(
const
uniset_rwmutex_wrlock
&
r
)
:
m
(
r
.
m
)
{
}
uniset_rwmutex_wrlock
&
uniset_rwmutex_wrlock
::
operator
=
(
const
uniset_rwmutex_wrlock
&
r
)
{
if
(
this
!=
&
r
)
m
=
r
.
m
;
return
*
this
;
}
// -------------------------------------------------------------------------------------------
uniset_rwmutex_rlock
::
uniset_rwmutex_rlock
(
uniset_rwmutex
&
_m
)
:
m
(
_m
)
...
...
@@ -238,18 +224,4 @@ uniset_rwmutex_rlock::~uniset_rwmutex_rlock()
{
m
.
unlock
();
}
uniset_rwmutex_rlock
::
uniset_rwmutex_rlock
(
const
uniset_rwmutex_rlock
&
r
)
:
m
(
r
.
m
)
{
}
uniset_rwmutex_rlock
&
uniset_rwmutex_rlock
::
operator
=
(
const
uniset_rwmutex_rlock
&
r
)
{
if
(
this
!=
&
r
)
m
=
r
.
m
;
return
*
this
;
}
// -----------------------------------------------------------------------------
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment