Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ViSTA
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LuFG VR VIS
VR-Group
ViSTA
Commits
d09f9289
Commit
d09f9289
authored
9 years ago
by
drausch
Browse files
Options
Downloads
Patches
Plain Diff
removed using namespace std; (led to name clash)
parent
de3c4b1a
Branches
Branches containing commit
No related tags found
1 merge request
!15
Feature/clang compile fixes
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
+2
-3
2 additions, 3 deletions
VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
with
2 additions
and
3 deletions
VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
+
2
−
3
View file @
d09f9289
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment