1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00

Fully resolve potentially ambiguous symbols by removing using namespace statements from headers which have a cascading effect. This causes potential behavior changes when switching to c++11 since symbols can be exported from std and boost while both have been imported into the global namespace.

This commit is contained in:
David Mott
2019-04-26 08:21:47 -05:00
parent 1813add162
commit 4b9d046c6e
131 changed files with 600 additions and 630 deletions

View File

@ -16,6 +16,7 @@
MA 02110-1301, USA. */
// $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
#include <future> //cxx11test
#include "config.h"
@ -46,7 +47,7 @@ namespace
bool vFlg;
bool nFlg;
mutex coutMutex;
std::mutex coutMutex;
void shmDoit(key_t shm_key, const string& label)
{
@ -61,7 +62,7 @@ void shmDoit(key_t shm_key, const string& label)
bi::read_only);
bi::offset_t memSize = 0;
memObj.get_size(memSize);
mutex::scoped_lock lk(coutMutex);
std::lock_guard<std::mutex> lk(coutMutex);
cout << label << ": shm_key: " << shm_key <<
"; key_name: " << key_name <<
"; size: " << memSize << endl;
@ -102,7 +103,7 @@ void semDoit(key_t sem_key, const string& label)
bi::read_only);
bi::offset_t memSize = 0;
memObj.get_size(memSize);
mutex::scoped_lock lk(coutMutex);
std::lock_guard<std::mutex> lk(coutMutex);
cout << label << ": sem_key: " << sem_key <<
"; key_name: " << key_name <<
"; size: " << memSize << endl;