From 64d421b8b81f9fd3c5e5948ec7f0d7f874c87332 Mon Sep 17 00:00:00 2001
From: "wrenczes@gmail.com"
 <wrenczes@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Thu, 31 Mar 2011 11:07:50 +0000
Subject: [PATCH] Fixed a namespace collision that was causing compile errors
 in VS2010.  bind() was being interpreted as std::bind(), not the winsock
 bind() call.

---
 JGE/JGE.vcxproj        | 6 +++---
 JGE/src/pc/JSocket.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/JGE/JGE.vcxproj b/JGE/JGE.vcxproj
index b2570a2e6..bc14b3148 100644
--- a/JGE/JGE.vcxproj
+++ b/JGE/JGE.vcxproj
@@ -72,7 +72,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>Dependencies/include;$(JGEEXTRAS);../Boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -99,7 +99,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>Dependencies/include;$(JGEEXTRAS);../Boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -126,7 +126,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>Dependencies/include;$(JGEEXTRAS);../Boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_HAS_ITERATOR_DEBBUGING=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
diff --git a/JGE/src/pc/JSocket.cpp b/JGE/src/pc/JSocket.cpp
index d205aa6c2..5a13848fe 100644
--- a/JGE/src/pc/JSocket.cpp
+++ b/JGE/src/pc/JSocket.cpp
@@ -153,7 +153,7 @@ JSocket::JSocket()
   Adresse_Socket_Connection.sin_family=AF_INET;
   Adresse_Socket_Connection.sin_port=htons(SERVER_PORT);
 
-  result=bind(mfd,
+  result=::bind(mfd,
     (struct sockaddr*)&Adresse_Socket_Connection,
     sizeof(Adresse_Socket_Connection));
   if(result!=0){