database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +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

2
primitives/primproc/dictstep.h
View File

@@ -138,7 +138,7 @@ private:
int64_t* values;
boost::scoped_array<std::string>* strValues;
int compressionType;
ByteStream filterString;
messageqcpp::ByteStream filterString;
uint32_t filterCount;
uint32_t bufferSize;
uint16_t inputRidCount;

2
primitives/primproc/primproc.cpp
View File

@@ -21,6 +21,8 @@
*
*
***********************************************************************/
#include <future> //cxx11test
#include <unistd.h>
#include <string>
#include <iostream>

8
primitives/primproc/umsocketselector.cpp
View File

@@ -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)
{

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.
*