From 9ee38bd681fca37ea55b82fdca3341f12df6300e Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Sat, 29 Sep 2012 14:52:01 +0200 Subject: [PATCH] Made SFML global objects "const" --- include/SFML/Graphics/Transform.h | 2 +- include/SFML/Network/IpAddress.h | 6 +++--- src/SFML/Graphics/Transform.cpp | 2 +- src/SFML/Network/IpAddress.cpp | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/SFML/Graphics/Transform.h b/include/SFML/Graphics/Transform.h index 783b7fc..28b62fa 100644 --- a/include/SFML/Graphics/Transform.h +++ b/include/SFML/Graphics/Transform.h @@ -49,7 +49,7 @@ typedef struct /// \brief Identity transform (does nothing) /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfTransform sfTransform_Identity; +CSFML_GRAPHICS_API const sfTransform sfTransform_Identity; //////////////////////////////////////////////////////////// /// \brief Create a new transform from a matrix diff --git a/include/SFML/Network/IpAddress.h b/include/SFML/Network/IpAddress.h index 3501a53..4f5db42 100644 --- a/include/SFML/Network/IpAddress.h +++ b/include/SFML/Network/IpAddress.h @@ -46,19 +46,19 @@ typedef struct /// \brief Empty object that represents invalid addresses /// //////////////////////////////////////////////////////////// -CSFML_NETWORK_API sfIpAddress sfIpAddress_None; +CSFML_NETWORK_API const sfIpAddress sfIpAddress_None; //////////////////////////////////////////////////////////// /// \brief Local host IP address (127.0.0.1, or "localhost") /// //////////////////////////////////////////////////////////// -CSFML_NETWORK_API sfIpAddress sfIpAddress_LocalHost; +CSFML_NETWORK_API const sfIpAddress sfIpAddress_LocalHost; //////////////////////////////////////////////////////////// /// \brief UDP broadcast address (255.255.255.255) /// //////////////////////////////////////////////////////////// -CSFML_NETWORK_API sfIpAddress sfIpAddress_Broadcast; +CSFML_NETWORK_API const sfIpAddress sfIpAddress_Broadcast; //////////////////////////////////////////////////////////// /// \brief Create an address from a string diff --git a/src/SFML/Graphics/Transform.cpp b/src/SFML/Graphics/Transform.cpp index b976d79..6221cb3 100644 --- a/src/SFML/Graphics/Transform.cpp +++ b/src/SFML/Graphics/Transform.cpp @@ -33,7 +33,7 @@ //////////////////////////////////////////////////////////// -sfTransform sfTransform_Identity = +const sfTransform sfTransform_Identity = { 1, 0, 0, 0, 1, 0, diff --git a/src/SFML/Network/IpAddress.cpp b/src/SFML/Network/IpAddress.cpp index 10ca262..4bd5f3b 100644 --- a/src/SFML/Network/IpAddress.cpp +++ b/src/SFML/Network/IpAddress.cpp @@ -50,15 +50,15 @@ namespace //////////////////////////////////////////////////////////// -sfIpAddress sfIpAddress_None = sfIpAddress_fromBytes(0, 0, 0, 0); +const sfIpAddress sfIpAddress_None = sfIpAddress_fromBytes(0, 0, 0, 0); //////////////////////////////////////////////////////////// -sfIpAddress sfIpAddress_LocalHost = sfIpAddress_fromBytes(127, 0, 0, 1); +const sfIpAddress sfIpAddress_LocalHost = sfIpAddress_fromBytes(127, 0, 0, 1); //////////////////////////////////////////////////////////// -sfIpAddress sfIpAddress_Broadcast = sfIpAddress_fromBytes(255, 255, 255, 255); +const sfIpAddress sfIpAddress_Broadcast = sfIpAddress_fromBytes(255, 255, 255, 255); ////////////////////////////////////////////////////////////