lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed the parameter of LoadFromMemory functions to be a const void* instead of a const char*

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1409 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-02-17 14:43:09 +00:00
parent b60fda48d9
commit 47d019098c
24 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SFML/Audio/Music.hpp
View file

@ -96,7 +96,7 @@ public :
/// \see OpenFromFile
///
////////////////////////////////////////////////////////////
bool OpenFromMemory(const char* data, std::size_t sizeInBytes);
bool OpenFromMemory(const void* data, std::size_t sizeInBytes);
////////////////////////////////////////////////////////////
/// \brief Get the total duration of the music

2
include/SFML/Audio/SoundBuffer.hpp
View file

@ -98,7 +98,7 @@ public :
/// \see LoadFromFile, LoadFromSamples, SaveToFile
///
////////////////////////////////////////////////////////////
bool LoadFromMemory(const char* data, std::size_t sizeInBytes);
bool LoadFromMemory(const void* data, std::size_t sizeInBytes);
////////////////////////////////////////////////////////////
/// \brief Load the sound buffer from an array of audio samples

2
include/SFML/Graphics/Font.hpp
View file

@ -108,7 +108,7 @@ public :
/// \see LoadFromFile
///
////////////////////////////////////////////////////////////
bool LoadFromMemory(const char* data, std::size_t sizeInBytes);
bool LoadFromMemory(const void* data, std::size_t sizeInBytes);
////////////////////////////////////////////////////////////
/// \brief Retrieve a glyph of the font

2
include/SFML/Graphics/Image.hpp
View file

@ -87,7 +87,7 @@ public :
/// \return True if loading was successful
///
////////////////////////////////////////////////////////////
bool LoadFromMemory(const char* data, std::size_t sizeInBytes);
bool LoadFromMemory(const void* data, std::size_t sizeInBytes);
////////////////////////////////////////////////////////////
/// Load the image directly from an array of pixels

6
include/SFML/Network/SocketTCP.hpp
View file

@ -98,13 +98,13 @@ public :
////////////////////////////////////////////////////////////
/// Send an array of bytes to the host (must be connected first)
///
/// \param data : Pointer to the bytes to send
/// \param size : Number of bytes to send
/// \param data : Pointer to the bytes to send
/// \param sizeInBytes : Number of bytes to send
///
/// \return Status code
///
////////////////////////////////////////////////////////////
Socket::Status Send(const char* data, std::size_t size);
Socket::Status Send(const char* data, std::size_t sizeInBytes);
////////////////////////////////////////////////////////////
/// Receive an array of bytes from the host (must be connected first).

10
include/SFML/Network/SocketUDP.hpp
View file

@ -82,15 +82,15 @@ public :
////////////////////////////////////////////////////////////
/// Send an array of bytes
///
/// \param data : Pointer to the bytes to send
/// \param size : Number of bytes to send
/// \param address : Address of the computer to send the packet to
/// \param port : Port to send the data to
/// \param data : Pointer to the bytes to send
/// \param sizeInBytes : Number of bytes to send
/// \param address : Address of the computer to send the packet to
/// \param port : Port to send the data to
///
/// \return Status code
///
////////////////////////////////////////////////////////////
Socket::Status Send(const char* data, std::size_t size, const IPAddress& address, unsigned short port);
Socket::Status Send(const char* data, std::size_t sizeInBytes, const IPAddress& address, unsigned short port);
////////////////////////////////////////////////////////////
/// Receive an array of bytes.