You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-12-24 14:20:59 +03:00
compilation failure
error: reference to 'mutex' is ambiguous note: candidates are: 'class boost::mutex' note: 'class std::mutex'
This commit is contained in:
@@ -99,7 +99,7 @@ RedistributeWorkerThread::RedistributeWorkerThread(ByteStream& bs, IOSocket& ios
|
||||
|
||||
RedistributeWorkerThread::~RedistributeWorkerThread()
|
||||
{
|
||||
mutex::scoped_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
|
||||
if (fNewFilePtr)
|
||||
closeFile(fNewFilePtr);
|
||||
@@ -140,7 +140,7 @@ void RedistributeWorkerThread::handleRequest()
|
||||
{
|
||||
// clear stop flag if ever set.
|
||||
{
|
||||
mutex::scoped_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
fStopAction = false;
|
||||
fCommitted = false;
|
||||
}
|
||||
@@ -188,7 +188,7 @@ void RedistributeWorkerThread::handleRequest()
|
||||
|
||||
sendResponse(RED_ACTN_REQUEST);
|
||||
|
||||
mutex::scoped_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
fWesInUse.clear();
|
||||
fMsgQueueClient.reset();
|
||||
|
||||
@@ -910,7 +910,7 @@ int RedistributeWorkerThread::updateDbrm()
|
||||
{
|
||||
int rc1 = BRM::ERR_OK;
|
||||
int rc2 = BRM::ERR_OK;
|
||||
mutex::scoped_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
|
||||
// cannot stop after extent map is updated.
|
||||
if (!fStopAction)
|
||||
@@ -1113,7 +1113,7 @@ void RedistributeWorkerThread::addToDirSet(const char* fileName, bool isSource)
|
||||
|
||||
void RedistributeWorkerThread::handleStop()
|
||||
{
|
||||
mutex::scoped_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
|
||||
// cannot stop after extent map is updated.
|
||||
if (!fCommitted)
|
||||
|
||||
Reference in New Issue
Block a user