You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +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:
@ -243,7 +243,7 @@ UmSocketSelector::addConnection(
|
||||
// ioSock (in) - socket/port connection to be deleted
|
||||
//------------------------------------------------------------------------------
|
||||
void
|
||||
UmSocketSelector::delConnection( const IOSocket& ios )
|
||||
UmSocketSelector::delConnection( const messageqcpp::IOSocket& ios )
|
||||
{
|
||||
sockaddr sa = ios.sa();
|
||||
const sockaddr_in* sinp = reinterpret_cast<const sockaddr_in*>(&sa);
|
||||
@ -271,7 +271,7 @@ UmSocketSelector::delConnection( const IOSocket& ios )
|
||||
//------------------------------------------------------------------------------
|
||||
bool
|
||||
UmSocketSelector::nextIOSocket(
|
||||
const IOSocket& ios,
|
||||
const messageqcpp::IOSocket& ios,
|
||||
SP_UM_IOSOCK& outIos,
|
||||
SP_UM_MUTEX& writeLock )
|
||||
{
|
||||
@ -405,7 +405,7 @@ UmModuleIPs::addSocketConn(
|
||||
// ioSock (in) - socket/port connection to be deleted
|
||||
//------------------------------------------------------------------------------
|
||||
void
|
||||
UmModuleIPs::delSocketConn( const IOSocket& ioSock )
|
||||
UmModuleIPs::delSocketConn( const messageqcpp::IOSocket& ioSock )
|
||||
{
|
||||
boost::mutex::scoped_lock lock( fUmModuleMutex );
|
||||
|
||||
@ -565,7 +565,7 @@ UmIPSocketConns::addSocketConn(
|
||||
// can benefit from quick random access.
|
||||
//------------------------------------------------------------------------------
|
||||
void
|
||||
UmIPSocketConns::delSocketConn( const IOSocket& ioSock )
|
||||
UmIPSocketConns::delSocketConn( const messageqcpp::IOSocket& ioSock )
|
||||
{
|
||||
for (unsigned int i = 0; i < fIOSockets.size(); ++i)
|
||||
{
|
||||
|
Reference in New Issue
Block a user