From fd8fa4e2f8a335b49de178f1dca366306343df25 Mon Sep 17 00:00:00 2001
From: laurentgom <laurentgom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Tue, 23 Mar 2010 11:15:39 +0000
Subject: [PATCH] Fixed errors caused by the last commit in the network module,
 and fixed minor warnings in the graphics module, on Linux

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1476 4e206d99-4929-0410-ac5d-dfc041789085
---
 src/SFML/Graphics/Font.cpp     | 15 ++++++++-------
 src/SFML/Graphics/Image.cpp    |  3 ++-
 src/SFML/Network/TcpSocket.cpp |  3 ++-
 src/SFML/Network/UdpSocket.cpp |  3 ++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp
index a5e61a38..0d0df030 100644
--- a/src/SFML/Graphics/Font.cpp
+++ b/src/SFML/Graphics/Font.cpp
@@ -48,13 +48,14 @@ myCurrentSize(0)
 
 
 ////////////////////////////////////////////////////////////
-Font::Font(const Font& copy) :
-myLibrary    (copy.myLibrary),
-myFace       (copy.myFace),
-myRefCount   (copy.myRefCount),
-myPages      (copy.myPages),
-myPixelBuffer(copy.myPixelBuffer),
-myCurrentSize(copy.myCurrentSize)
+Font::Font(const Font& copy) :
+Resource<Font>(),
+myLibrary     (copy.myLibrary),
+myFace        (copy.myFace),
+myRefCount    (copy.myRefCount),
+myPages       (copy.myPages),
+myPixelBuffer (copy.myPixelBuffer),
+myCurrentSize (copy.myCurrentSize)
 {
     // Note: as FreeType doesn't provide functions for copying/cloning,
     // we must share all the FreeType pointers
diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
index 55137ac1..d8f97f63 100644
--- a/src/SFML/Graphics/Image.cpp
+++ b/src/SFML/Graphics/Image.cpp
@@ -59,7 +59,8 @@ myPixelsFlipped (false)
 ////////////////////////////////////////////////////////////
 /// Copy constructor
 ////////////////////////////////////////////////////////////
-Image::Image(const Image& copy)
+Image::Image(const Image& copy) :
+Resource<Image>()
 {
     // First make sure that the source image is up-to-date
     copy.EnsureArrayUpdate();
diff --git a/src/SFML/Network/TcpSocket.cpp b/src/SFML/Network/TcpSocket.cpp
index 20d7881a..4c23e4fc 100644
--- a/src/SFML/Network/TcpSocket.cpp
+++ b/src/SFML/Network/TcpSocket.cpp
@@ -30,7 +30,8 @@
 #include <SFML/Network/Packet.hpp>
 #include <SFML/Network/SocketImpl.hpp>
 #include <SFML/System/Err.hpp>
-#include <algorithm>
+#include <algorithm>
+#include <string.h>
 
 #ifdef _MSC_VER
     #pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro
diff --git a/src/SFML/Network/UdpSocket.cpp b/src/SFML/Network/UdpSocket.cpp
index d4269c00..0c278793 100644
--- a/src/SFML/Network/UdpSocket.cpp
+++ b/src/SFML/Network/UdpSocket.cpp
@@ -30,7 +30,8 @@
 #include <SFML/Network/Packet.hpp>
 #include <SFML/Network/SocketImpl.hpp>
 #include <SFML/System/Err.hpp>
-#include <algorithm>
+#include <algorithm>
+#include <string.h>
 
 
 namespace sf