database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +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

12
primitives/primproc/umsocketselector.h
View File

@ -52,8 +52,6 @@ typedef uint32_t in_addr_t;
#include "iosocket.h"
using namespace messageqcpp;
namespace primitiveprocessor
{
class UmModuleIPs;
@ -61,7 +59,7 @@ class UmIPSocketConns;
typedef boost::shared_ptr<UmModuleIPs> SP_UM_MODIPS;
typedef boost::shared_ptr<UmIPSocketConns> SP_UM_IPCONNS;
typedef boost::shared_ptr<IOSocket> SP_UM_IOSOCK;
typedef boost::shared_ptr<messageqcpp::IOSocket> SP_UM_IOSOCK;
typedef boost::shared_ptr<boost::mutex> SP_UM_MUTEX;
//------------------------------------------------------------------------------
@ -116,7 +114,7 @@ public:
*
* @param ios (in) socket/port connection to be removed.
*/
void delConnection( const IOSocket& ios );
void delConnection( const messageqcpp::IOSocket& ios );
/** @brief Get the next output IOSocket to use for the specified ios.
*
@ -125,7 +123,7 @@ public:
* @param writeLock (out) mutex to use when writing to outIos.
* @return boolean indicating if operation was successful.
*/
bool nextIOSocket( const IOSocket& ios, SP_UM_IOSOCK& outIos,
bool nextIOSocket( const messageqcpp::IOSocket& ios, SP_UM_IOSOCK& outIos,
SP_UM_MUTEX& writeLock );
/** @brief toString method used in logging, debugging, etc.
@ -217,7 +215,7 @@ public:
*
* @param ioSock (in) socket/port to delete from the connection list.
*/
void delSocketConn ( const IOSocket& ioSock );
void delSocketConn ( const messageqcpp::IOSocket& ioSock );
/** @brief Get the "next" available socket/port for this UM module.
*
@ -311,7 +309,7 @@ public:
*
* @param ioSock (in) socket/port to delete from the connection list.
*/
void delSocketConn ( const IOSocket& ioSock );
void delSocketConn ( const messageqcpp::IOSocket& ioSock );
/** @brief Get the "next" available socket/port for this IP address.
*