Remove compile time assert for animatable property registration

The compile time assert to check the order of the properties relies on
the __COUNTER__ macro which generates sequential integral values starting
from 0 at compile time and there is no way to reset it. Therefore, while
using __COUNTER_ for both DALI_PROPERTY_REGISTRATION and
DALI_ANIMATABLE_PROPERTY_REGISTRATION, depending on which macro is called
first, the condition used by the assert in the other macro will always
get the wrong count.

Change-Id: I7c263cc505050fa9bf73d652a1535fd652ec7596

diff --git a/dali/public-api/object/type-registry-helper.h b/dali/public-api/object/type-registry-helper.h
index e2b8ac6..2eb873f 100644 (file)
--- a/dali/public-api/object/type-registry-helper.h
+++ b/dali/public-api/object/type-registry-helper.h
@@ -44,8 +44,7 @@ namespace Internal
   DALI_COMPILE_TIME_ASSERT( ( Toolkit::objectType::Property::enumIndex - Toolkit::objectType::PROPERTY_START_INDEX ) == count );
 
 #define DALI_ANIMATABLE_PROPERTY_REGISTRATION_INTERNAL( count, typeRegistrationObject, objectType, text, valueType, enumIndex) \
-  AnimatablePropertyRegistration DALI_TOKEN_PASTE( property, count ) ( typeRegistrationObject, text, Toolkit::objectType::AnimatableProperty::enumIndex, Property::valueType ); \
-  DALI_COMPILE_TIME_ASSERT( ( Toolkit::objectType::AnimatableProperty::enumIndex - Toolkit::objectType::ANIMATABLE_PROPERTY_START_INDEX ) == count );
+  AnimatablePropertyRegistration DALI_TOKEN_PASTE( property, count ) ( typeRegistrationObject, text, Toolkit::objectType::AnimatableProperty::enumIndex, Property::valueType );
 
 #define DALI_SIGNAL_REGISTRATION_INTERNAL( count, typeRegistrationObject, objectType, text, textVariable ) \
   const char* const textVariable = text; \