From d09f9289fdbde6da83d698dda2d979c51f53491f Mon Sep 17 00:00:00 2001
From: drausch <dominik.rausch@rwth-aachen.de>
Date: Mon, 30 May 2016 13:44:37 +0200
Subject: [PATCH] removed using namespace std; (led to name clash)
---
VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
index d05e64300..b85395a1d 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
@@ -51,7 +51,6 @@
#include <time.h>
#endif
#include <iostream>
-using namespace std;
#include <cerrno> // errno
#include <cstring>
@@ -62,7 +61,7 @@ using namespace std;
/* MACROS AND DEFINES */
/*============================================================================*/
-bool IVistaSocket::PrintErrorMessage(const string &sMethodName)
+bool IVistaSocket::PrintErrorMessage(const std::string &sMethodName)
{
std::string sErrorMessage;
#ifdef WIN32
@@ -671,7 +670,7 @@ int IVistaSocket::ReceiveRaw(void *pvBuffer, const int iLength, int iTimeout, i
if(PrintErrorMessage("ReceiveRaw") == false)
{
// it's a real error and _not_ WOULDBLOCK
- if(GetSocketTypeString() != string("UDP"))
+ if(GetSocketTypeString() != std::string("UDP"))
{
// we have a real error on a tcp socket
SetErrorState(true);
--
GitLab