Browse Source

Merge pull request #64253 from heppocogne/Fix-native-enum-release-1

Register enum type names in release build
Rémi Verschelde 2 years ago
parent
commit
1816f49886
1 changed files with 5 additions and 14 deletions
  1. 5 14
      core/object/class_db.h

+ 5 - 14
core/object/class_db.h

@@ -372,17 +372,17 @@ public:
 	static uint64_t get_native_struct_size(const StringName &p_name); // Used for asserting
 	static uint64_t get_native_struct_size(const StringName &p_name); // Used for asserting
 };
 };
 
 
-#ifdef DEBUG_METHODS_ENABLED
-
-#define BIND_CONSTANT(m_constant) \
-	::ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);
-
 #define BIND_ENUM_CONSTANT(m_constant) \
 #define BIND_ENUM_CONSTANT(m_constant) \
 	::ClassDB::bind_integer_constant(get_class_static(), __constant_get_enum_name(m_constant, #m_constant), #m_constant, m_constant);
 	::ClassDB::bind_integer_constant(get_class_static(), __constant_get_enum_name(m_constant, #m_constant), #m_constant, m_constant);
 
 
 #define BIND_BITFIELD_FLAG(m_constant) \
 #define BIND_BITFIELD_FLAG(m_constant) \
 	::ClassDB::bind_integer_constant(get_class_static(), __constant_get_bitfield_name(m_constant, #m_constant), #m_constant, m_constant, true);
 	::ClassDB::bind_integer_constant(get_class_static(), __constant_get_bitfield_name(m_constant, #m_constant), #m_constant, m_constant, true);
 
 
+#define BIND_CONSTANT(m_constant) \
+	::ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);
+
+#ifdef DEBUG_METHODS_ENABLED
+
 _FORCE_INLINE_ void errarray_add_str(Vector<Error> &arr) {
 _FORCE_INLINE_ void errarray_add_str(Vector<Error> &arr) {
 }
 }
 
 
@@ -408,15 +408,6 @@ _FORCE_INLINE_ Vector<Error> errarray(P... p_args) {
 
 
 #else
 #else
 
 
-#define BIND_CONSTANT(m_constant) \
-	::ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);
-
-#define BIND_ENUM_CONSTANT(m_constant) \
-	::ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);
-
-#define BIND_BITFIELD_FLAG(m_constant) \
-	::ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant, true);
-
 #define BIND_METHOD_ERR_RETURN_DOC(m_method, ...)
 #define BIND_METHOD_ERR_RETURN_DOC(m_method, ...)
 
 
 #endif
 #endif