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
This commit is contained in:
laurentgom 2010-03-23 11:15:39 +00:00
parent 9280771665
commit fd8fa4e2f8
4 changed files with 14 additions and 10 deletions

View File

@ -49,6 +49,7 @@ myCurrentSize(0)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Font::Font(const Font& copy) : Font::Font(const Font& copy) :
Resource<Font>(),
myLibrary (copy.myLibrary), myLibrary (copy.myLibrary),
myFace (copy.myFace), myFace (copy.myFace),
myRefCount (copy.myRefCount), myRefCount (copy.myRefCount),

View File

@ -59,7 +59,8 @@ myPixelsFlipped (false)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Copy constructor /// 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 // First make sure that the source image is up-to-date
copy.EnsureArrayUpdate(); copy.EnsureArrayUpdate();

View File

@ -31,6 +31,7 @@
#include <SFML/Network/SocketImpl.hpp> #include <SFML/Network/SocketImpl.hpp>
#include <SFML/System/Err.hpp> #include <SFML/System/Err.hpp>
#include <algorithm> #include <algorithm>
#include <string.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro #pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro

View File

@ -31,6 +31,7 @@
#include <SFML/Network/SocketImpl.hpp> #include <SFML/Network/SocketImpl.hpp>
#include <SFML/System/Err.hpp> #include <SFML/System/Err.hpp>
#include <algorithm> #include <algorithm>
#include <string.h>
namespace sf namespace sf