database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-27 21:01:50 +03:00
Code Activity

compilation failure

Browse Source 
error: reference to 'mutex' is ambiguous
note: candidates are: 'class boost::mutex'
note:                 'class std::mutex'
This commit is contained in:
Sergei Golubchik
2019-12-19 18:13:10 +01:00
parent 36a44ff136
commit 586391e1ca
39 changed files with 240 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
versioning/BRM/tablelockserver.cpp
View File

@ -40,7 +40,7 @@ namespace BRM
TableLockServer::TableLockServer(SessionManagerServer* sm) : sms(sm)
{
mutex::scoped_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
config::Config* config = config::Config::makeConfig();
filename = config->getConfig("SystemConfig", "TableLockSaveFile");
@ -135,7 +135,7 @@ uint64_t TableLockServer::lock(TableLockInfo* tli)
set<uint32_t> dbroots;
lit_t it;
uint32_t i;
mutex::scoped_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
for (i = 0; i < tli->dbrootList.size(); i++)
dbroots.insert(tli->dbrootList[i]);
@ -177,7 +177,7 @@ bool TableLockServer::unlock(uint64_t id)
std::map<uint64_t, TableLockInfo>::iterator it;
TableLockInfo tli;
mutex::scoped_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
it = locks.find(id);
if (it != locks.end())
@ -204,7 +204,7 @@ bool TableLockServer::unlock(uint64_t id)
bool TableLockServer::changeState(uint64_t id, LockState state)
{
lit_t it;
mutex::scoped_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
LockState old;
it = locks.find(id);
@ -232,7 +232,7 @@ bool TableLockServer::changeOwner(uint64_t id, const string& ownerName, uint32_t
int32_t txnID)
{
lit_t it;
mutex::scoped_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
string oldName;
uint32_t oldPID;
int32_t oldSession;
@ -271,7 +271,7 @@ bool TableLockServer::changeOwner(uint64_t id, const string& ownerName, uint32_t
vector<TableLockInfo> TableLockServer::getAllLocks() const
{
vector<TableLockInfo> ret;
mutex::scoped_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
constlit_t it;
for (it = locks.begin(); it != locks.end(); ++it)
@ -284,7 +284,7 @@ void TableLockServer::releaseAllLocks()
{
std::map<uint64_t, TableLockInfo> tmp;
mutex::scoped_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
tmp.swap(locks);
try
@ -301,7 +301,7 @@ void TableLockServer::releaseAllLocks()
bool TableLockServer::getLockInfo(uint64_t id, TableLockInfo* out) const
{
constlit_t it;
mutex::scoped_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
it = locks.find(id);