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

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.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
writeengine/splitter/we_brmupdater.cpp
View File

@ -512,13 +512,13 @@ bool WEBrmUpdater::prepareRowsInsertedInfo(std::string Entry,
bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
int& ColNum,
CalpontSystemCatalog::ColDataType& ColType,
execplan::CalpontSystemCatalog::ColDataType& ColType,
std::string& ColName,
int& OorValues)
{
bool aFound = false;
boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
CalpontSystemCatalog::makeCalpontSystemCatalog();
boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr =
execplan::CalpontSystemCatalog::makeCalpontSystemCatalog();
//DATA: 3 1
if ((!Entry.empty()) && (Entry.at(0) == 'D'))
@ -553,7 +553,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
if (pTok)
{
ColType = (CalpontSystemCatalog::ColDataType)atoi(pTok);
ColType = (execplan::CalpontSystemCatalog::ColDataType)atoi(pTok);
}
else
{
@ -566,7 +566,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
if (pTok)
{
uint64_t columnOid = strtol(pTok, NULL, 10);
CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid);
execplan::CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid);
ColName = colname.schema + "." + colname.table + "." + colname.column;
}
else