Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 726 vs 727 for /trunk/Source Code/Platform/Headers/PlatformDefines.h

Diff revisions: vs.
  @@ -654,7 +654,7 @@
654 654 bool preAssert(const bool expression, const char* failMessage);
655 655 /// It is safe to call evaluate expressions and call functions inside the assert
656 656 /// check as it will compile for every build type
657 - inline bool DIVIDE_ASSERT(const bool expression, const char* failMessage) {
657 + FORCE_INLINE bool DIVIDE_ASSERT(const bool expression, const char* failMessage) {
658 658 #if defined(_DEBUG) || defined(_PROFILE)
659 659 if (preAssert(expression, failMessage)) {
660 660 # if defined(_DEBUG)
  @@ -667,6 +667,10 @@
667 667 return expression;
668 668 }
669 669
670 + FORCE_INLINE void DIVIDE_UNEXPECTED_CALL(const char* failMessage = "") {
671 + DIVIDE_ASSERT(false, failMessage);
672 + }
673 +
670 674 typedef union {
671 675 U32 i;
672 676 U8 b[4];
  @@ -931,11 +935,18 @@
931 935
932 936 #endif
933 937
938 + #if defined(USE_CUSTOM_MEMORY_ALLOCATORS)
934 939 #if !defined(AUTOMATIC_XALLOCATOR_INIT_DESTROY)
935 940 #define AUTOMATIC_XALLOCATOR_INIT_DESTROY
936 941 #endif
937 -
938 942 // Modify the allocator values to TIGHTLY fit memory requirments
939 943 // The application will assert if it requires more allocators than the specified nubmer
940 944 // xallocator.cpp contains the number of allocators available
941 945 #include <Allocator/Allocator.h>
946 +
947 + #define USE_CUSTOM_ALLOCATOR DECLARE_ALLOCATOR
948 + #define IMPLEMENT_CUSTOM_ALLOCATOR(class, objects, memory) IMPLEMENT_ALLOCATOR(class, objects, memory)
949 + #else
950 + #define USE_CUSTOM_ALLOCATOR
951 + #define IMPLEMENT_CUSTOM_ALLOCATOR(class, objects, memory)
952 + #endif