mirror of
https://github.com/minetest/irrlicht.git
synced 2025-09-16 21:36:59 +02:00
API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.
C++ has undefined behavior for identifiers starting with __ or with _ followed by an uppercase letter. We still have many more (in IrrCompileConfig.h and in all header-guards), will likely replace those later as well. As a workaround for users which might use irrlicht defines in their code, I've added the header irrLegacyDefines.h Including that allows to continue using old defines for a while - or make it easier to have code which compiles with old and new Irrlicht library versions. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6251 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@@ -190,7 +190,7 @@ public:
|
||||
depends on the color format of the image. For example if the color
|
||||
format is ECF_A8R8G8B8, it is of u32. Be sure to call unlock() after
|
||||
you don't need the pointer any more. */
|
||||
_IRR_DEPRECATED_ void* lock()
|
||||
IRR_DEPRECATED void* lock()
|
||||
{
|
||||
return getData();
|
||||
}
|
||||
@@ -198,7 +198,7 @@ public:
|
||||
//! Unlock function.
|
||||
/** Should be called after the pointer received by lock() is not
|
||||
needed anymore. */
|
||||
_IRR_DEPRECATED_ void unlock()
|
||||
IRR_DEPRECATED void unlock()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -363,14 +363,14 @@ public:
|
||||
virtual void fill(const SColor &color) =0;
|
||||
|
||||
//! Inform whether the image is compressed
|
||||
_IRR_DEPRECATED_ bool isCompressed() const
|
||||
IRR_DEPRECATED bool isCompressed() const
|
||||
{
|
||||
return IImage::isCompressedFormat(Format);
|
||||
}
|
||||
|
||||
//! Check whether the image has MipMaps
|
||||
/** \return True if image has MipMaps, else false. */
|
||||
_IRR_DEPRECATED_ bool hasMipMaps() const
|
||||
IRR_DEPRECATED bool hasMipMaps() const
|
||||
{
|
||||
return (getMipMapsData() != 0);
|
||||
}
|
||||
|
Reference in New Issue
Block a user