Corrections

Author: Przemog1

include/EDeviceTypes.h

@@ -28,7 +28,7 @@ namespace irr
 
 		//! A device which uses Simple DirectMedia Layer
 		/** The SDL device works under all platforms supported by SDL but first must be compiled
-		in by defining the IRR_USE_SDL_DEVICE macro in IrrCompileConfig.h */
+		in by defining the NBL_USE_SDL_DEVICE macro in IrrCompileConfig.h */
 		EIDT_SDL,
 
 		//! A device for raw framebuffer access

include/irr/core/containers/FixedCapacityDoublyLinkedList.h

@@ -69,7 +69,7 @@ namespace impl
 			FixedCapacityDoublyLinkedListBase(const uint32_t capacity, void*& _reservedSpace, T*& _array)
 			{
 				const auto firstPart = core::alignUp(PoolAddressAllocator<uint32_t>::reserved_size(1u,capacity,1u),alignof(T));
-				_reservedSpace = _IRR_ALIGNED_MALLOC(firstPart+capacity*sizeof(T),alignof(T));
+				_reservedSpace = _NBL_ALIGNED_MALLOC(firstPart+capacity*sizeof(T),alignof(T));
 				_array = reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(_reservedSpace)+firstPart);
 			}
 	};
@@ -165,7 +165,7 @@ class FixedCapacityDoublyLinkedList : private impl::FixedCapacityDoublyLinkedLis
 		}
 		~FixedCapacityDoublyLinkedList()
 		{
-			_IRR_ALIGNED_FREE(m_reservedSpace);
+			_NBL_ALIGNED_FREE(m_reservedSpace);
 		}
 
 	private:

include/irr/core/containers/LRUCache.h

@@ -137,7 +137,7 @@ class LRUCache : private impl::LRUCacheBase<Key,Value,MapHash,MapEquals>
 			m_shortcut_map.reserve(capacity);
 		}
 
-	#ifdef _IRR_DEBUG
+	#ifdef _NBL_DEBUG
 		inline void print()
 		{
 			auto node = m_list.getBegin();
@@ -149,7 +149,7 @@ class LRUCache : private impl::LRUCacheBase<Key,Value,MapHash,MapEquals>
 				node = m_list.get(node->next);
 			}
 		}
-	#endif // _IRR_DEBUG
+	#endif // _NBL_DEBUG
 
 		//insert an element into the cache, or update an existing one with the same key
 		inline void insert(Key&& k, Value&& v) { common_insert(std::move(k), std::move(v)); }

include/irr/ext/Blur/CBlurPerformer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _IRR_EXT_BLUR_C_BLUR_PERFORMER_INCLUDED_
-#define _IRR_EXT_BLUR_C_BLUR_PERFORMER_INCLUDED_
+#ifndef _NBL_EXT_BLUR_C_BLUR_PERFORMER_INCLUDED_
+#define _NBL_EXT_BLUR_C_BLUR_PERFORMER_INCLUDED_
 
 #include <cstdint>
 #include <tuple>

include/irr/ext/Bullet/BulletUtility.h

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _IRR_EXT_BULLET_UTILITY_INCLUDED_
-#define _IRR_EXT_BULLET_UTILITY_INCLUDED_
+#ifndef _NBL_EXT_BULLET_UTILITY_INCLUDED_
+#define _NBL_EXT_BULLET_UTILITY_INCLUDED_
 
 #include "irrlicht.h"
 #include <cstdint>

include/irr/ext/Bullet/CDebugRender.h

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _IRR_EXT_BULLET_C_DEBUG_RENDER_INCLUDED_
-#define _IRR_EXT_BULLET_C_DEBUG_RENDER_INCLUDED_
+#ifndef _NBL_EXT_BULLET_C_DEBUG_RENDER_INCLUDED_
+#define _NBL_EXT_BULLET_C_DEBUG_RENDER_INCLUDED_
 
 #include "irrlicht.h"
 #include "irr/core/IReferenceCounted.h"

include/irr/ext/Bullet/CInstancedMotionState.h

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _IRR_EXT_BULLET_C_INSTANCED_MOTION_STATE_INCLUDED_
-#define _IRR_EXT_BULLET_C_INSTANCED_MOTION_STATE_INCLUDED_
+#ifndef _NBL_EXT_BULLET_C_INSTANCED_MOTION_STATE_INCLUDED_
+#define _NBL_EXT_BULLET_C_INSTANCED_MOTION_STATE_INCLUDED_
 
 #include <cstdint>
 #include "irrlicht.h"

include/irr/ext/Bullet/CPhysicsWorld.h

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _IRR_EXT_BULLET_C_PHYSICS_WORLD_INCLUDED_
-#define _IRR_EXT_BULLET_C_PHYSICS_WORLD_INCLUDED_
+#ifndef _NBL_EXT_BULLET_C_PHYSICS_WORLD_INCLUDED_
+#define _NBL_EXT_BULLET_C_PHYSICS_WORLD_INCLUDED_
 
 #include <cstdint>
 #include <type_traits>
@@ -37,14 +37,14 @@ class CPhysicsWorld : public core::IReferenceCounted {
 
     template<class btObject, typename... Args>
     inline btObject *createbtObject(Args&&... args) {
-        void *mem = _IRR_ALIGNED_MALLOC(sizeof(btObject), 32u);
+        void *mem = _NBL_ALIGNED_MALLOC(sizeof(btObject), 32u);
         return new(mem) btObject(std::forward<Args>(args)...);
     }
 
     template<class btObject>
     inline void deletebtObject(btObject *obj) {
         obj->~btObject();
-        _IRR_ALIGNED_FREE(obj);
+        _NBL_ALIGNED_FREE(obj);
     }
 
 

include/irr/ext/Bullet/IMotionStateBase.h

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _IRR_EXT_BULLET_I_MOTION_STATE_BASE_INCLUDED_
-#define _IRR_EXT_BULLET_I_MOTION_STATE_BASE_INCLUDED_
+#ifndef _NBL_EXT_BULLET_I_MOTION_STATE_BASE_INCLUDED_
+#define _NBL_EXT_BULLET_I_MOTION_STATE_BASE_INCLUDED_
 
 #include <cstdint>
 #include "irrlicht.h"

include/irr/ext/CEGUI/CEGUIOpenGLClip.h

@@ -25,8 +25,8 @@ SOFTWARE.
 
 */
 
-#ifndef _IRR_EXT_CEGUI_OPENGL_CLIP_INCLUDED_
-#define _IRR_EXT_CEGUI_OPENGL_CLIP_INCLUDED_
+#ifndef _NBL_EXT_CEGUI_OPENGL_CLIP_INCLUDED_
+#define _NBL_EXT_CEGUI_OPENGL_CLIP_INCLUDED_
 
 namespace irr
 {
@@ -47,4 +47,4 @@ void resetOpenGLClip();
 } // namespace ext
 } // namespace irr
 
-#endif // _IRR_EXT_CEGUI_OPENGL_CLIP_INCLUDED_
+#endif