Skip to content

Commit 1a89648

Browse files
RepiteoRepiteo
committed
Merge pull request #110206 from aaronp64/remove_unused_enum_bitfield_param
Remove unused parameter in `__constant_get_enum_name`/`__constant_get_bitfield_name`
2 parents d51c13f + cfde73a commit 1a89648

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎core/core_constants.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ static HashMap<StringName, Vector<_CoreConstant>> _global_enums;
7575

7676
#define BIND_CORE_ENUM_CONSTANT(m_constant) \
7777
{ \
78-
StringName enum_name = __constant_get_enum_name(m_constant, #m_constant); \
78+
StringName enum_name = __constant_get_enum_name(m_constant); \
7979
_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant)); \
8080
_global_constants_map[#m_constant] = _global_constants.size() - 1; \
8181
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
8282
}
8383

8484
#define BIND_CORE_BITFIELD_FLAG(m_constant) \
8585
{ \
86-
StringName enum_name = __constant_get_bitfield_name(m_constant, #m_constant); \
86+
StringName enum_name = __constant_get_bitfield_name(m_constant); \
8787
_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant, false, true)); \
8888
_global_constants_map[#m_constant] = _global_constants.size() - 1; \
8989
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
@@ -92,47 +92,47 @@ static HashMap<StringName, Vector<_CoreConstant>> _global_enums;
9292
// This just binds enum classes as if they were regular enum constants.
9393
#define BIND_CORE_ENUM_CLASS_CONSTANT(m_enum, m_prefix, m_member) \
9494
{ \
95-
StringName enum_name = __constant_get_enum_name(m_enum::m_member, #m_prefix "_" #m_member); \
95+
StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
9696
_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member)); \
9797
_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
9898
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
9999
}
100100

101101
#define BIND_CORE_BITFIELD_CLASS_FLAG(m_enum, m_prefix, m_member) \
102102
{ \
103-
StringName enum_name = __constant_get_bitfield_name(m_enum::m_member, #m_prefix "_" #m_member); \
103+
StringName enum_name = __constant_get_bitfield_name(m_enum::m_member); \
104104
_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member, false, true)); \
105105
_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
106106
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
107107
}
108108

109109
#define BIND_CORE_ENUM_CLASS_CONSTANT_CUSTOM(m_enum, m_name, m_member) \
110110
{ \
111-
StringName enum_name = __constant_get_enum_name(m_enum::m_member, #m_name); \
111+
StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
112112
_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member)); \
113113
_global_constants_map[#m_name] = _global_constants.size() - 1; \
114114
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
115115
}
116116

117117
#define BIND_CORE_BITFIELD_CLASS_FLAG_CUSTOM(m_enum, m_name, m_member) \
118118
{ \
119-
StringName enum_name = __constant_get_bitfield_name(m_enum::m_member, #m_name); \
119+
StringName enum_name = __constant_get_bitfield_name(m_enum::m_member); \
120120
_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member, false, true)); \
121121
_global_constants_map[#m_name] = _global_constants.size() - 1; \
122122
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
123123
}
124124

125125
#define BIND_CORE_ENUM_CLASS_CONSTANT_NO_VAL(m_enum, m_prefix, m_member) \
126126
{ \
127-
StringName enum_name = __constant_get_enum_name(m_enum::m_member, #m_prefix "_" #m_member); \
127+
StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
128128
_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member, true)); \
129129
_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
130130
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
131131
}
132132

133133
#define BIND_CORE_ENUM_CONSTANT_CUSTOM(m_custom_name, m_constant) \
134134
{ \
135-
StringName enum_name = __constant_get_enum_name(m_constant, #m_constant); \
135+
StringName enum_name = __constant_get_enum_name(m_constant); \
136136
_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant)); \
137137
_global_constants_map[m_custom_name] = _global_constants.size() - 1; \
138138
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
@@ -144,15 +144,15 @@ static HashMap<StringName, Vector<_CoreConstant>> _global_enums;
144144

145145
#define BIND_CORE_ENUM_CONSTANT_NO_VAL(m_constant) \
146146
{ \
147-
StringName enum_name = __constant_get_enum_name(m_constant, #m_constant); \
147+
StringName enum_name = __constant_get_enum_name(m_constant); \
148148
_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant, true)); \
149149
_global_constants_map[#m_constant] = _global_constants.size() - 1; \
150150
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
151151
}
152152

153153
#define BIND_CORE_ENUM_CONSTANT_CUSTOM_NO_VAL(m_custom_name, m_constant) \
154154
{ \
155-
StringName enum_name = __constant_get_enum_name(m_constant, #m_constant); \
155+
StringName enum_name = __constant_get_enum_name(m_constant); \
156156
_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant, true)); \
157157
_global_constants_map[m_custom_name] = _global_constants.size() - 1; \
158158
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
@@ -166,15 +166,15 @@ static HashMap<StringName, Vector<_CoreConstant>> _global_enums;
166166

167167
#define BIND_CORE_ENUM_CONSTANT(m_constant) \
168168
{ \
169-
StringName enum_name = __constant_get_enum_name(m_constant, #m_constant); \
169+
StringName enum_name = __constant_get_enum_name(m_constant); \
170170
_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant)); \
171171
_global_constants_map[#m_constant] = _global_constants.size() - 1; \
172172
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
173173
}
174174

175175
#define BIND_CORE_BITFIELD_FLAG(m_constant) \
176176
{ \
177-
StringName enum_name = __constant_get_bitfield_name(m_constant, #m_constant); \
177+
StringName enum_name = __constant_get_bitfield_name(m_constant); \
178178
_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant)); \
179179
_global_constants_map[#m_constant] = _global_constants.size() - 1; \
180180
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
@@ -183,47 +183,47 @@ static HashMap<StringName, Vector<_CoreConstant>> _global_enums;
183183
// This just binds enum classes as if they were regular enum constants.
184184
#define BIND_CORE_ENUM_CLASS_CONSTANT(m_enum, m_prefix, m_member) \
185185
{ \
186-
StringName enum_name = __constant_get_enum_name(m_enum::m_member, #m_prefix "_" #m_member); \
186+
StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
187187
_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member)); \
188188
_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
189189
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
190190
}
191191

192192
#define BIND_CORE_BITFIELD_CLASS_FLAG(m_enum, m_prefix, m_member) \
193193
{ \
194-
StringName enum_name = __constant_get_bitfield_name(m_enum::m_member, #m_prefix "_" #m_member); \
194+
StringName enum_name = __constant_get_bitfield_name(m_enum::m_member); \
195195
_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member)); \
196196
_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
197197
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
198198
}
199199

200200
#define BIND_CORE_ENUM_CLASS_CONSTANT_CUSTOM(m_enum, m_name, m_member) \
201201
{ \
202-
StringName enum_name = __constant_get_enum_name(m_enum::m_member, #m_name); \
202+
StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
203203
_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member)); \
204204
_global_constants_map[#m_name] = _global_constants.size() - 1; \
205205
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
206206
}
207207

208208
#define BIND_CORE_BITFIELD_CLASS_FLAG_CUSTOM(m_enum, m_name, m_member) \
209209
{ \
210-
StringName enum_name = __constant_get_bitfield_name(m_enum::m_member, #m_name); \
210+
StringName enum_name = __constant_get_bitfield_name(m_enum::m_member); \
211211
_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member)); \
212212
_global_constants_map[#m_name] = _global_constants.size() - 1; \
213213
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
214214
}
215215

216216
#define BIND_CORE_ENUM_CLASS_CONSTANT_NO_VAL(m_enum, m_prefix, m_member) \
217217
{ \
218-
StringName enum_name = __constant_get_enum_name(m_enum::m_member, #m_prefix "_" #m_member); \
218+
StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
219219
_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member)); \
220220
_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
221221
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
222222
}
223223

224224
#define BIND_CORE_ENUM_CONSTANT_CUSTOM(m_custom_name, m_constant) \
225225
{ \
226-
StringName enum_name = __constant_get_enum_name(m_constant, #m_constant); \
226+
StringName enum_name = __constant_get_enum_name(m_constant); \
227227
_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant)); \
228228
_global_constants_map[m_custom_name] = _global_constants.size() - 1; \
229229
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
@@ -235,15 +235,15 @@ static HashMap<StringName, Vector<_CoreConstant>> _global_enums;
235235

236236
#define BIND_CORE_ENUM_CONSTANT_NO_VAL(m_constant) \
237237
{ \
238-
StringName enum_name = __constant_get_enum_name(m_constant, #m_constant); \
238+
StringName enum_name = __constant_get_enum_name(m_constant); \
239239
_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant)); \
240240
_global_constants_map[#m_constant] = _global_constants.size() - 1; \
241241
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
242242
}
243243

244244
#define BIND_CORE_ENUM_CONSTANT_CUSTOM_NO_VAL(m_custom_name, m_constant) \
245245
{ \
246-
StringName enum_name = __constant_get_enum_name(m_constant, #m_constant); \
246+
StringName enum_name = __constant_get_enum_name(m_constant); \
247247
_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant)); \
248248
_global_constants_map[m_custom_name] = _global_constants.size() - 1; \
249249
_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \

‎core/object/class_db.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,10 +532,10 @@ class ClassDB {
532532
};
533533

534534
#define BIND_ENUM_CONSTANT(m_constant) \
535-
::ClassDB::bind_integer_constant(get_class_static(), __constant_get_enum_name(m_constant, #m_constant), #m_constant, m_constant);
535+
::ClassDB::bind_integer_constant(get_class_static(), __constant_get_enum_name(m_constant), #m_constant, m_constant);
536536

537537
#define BIND_BITFIELD_FLAG(m_constant) \
538-
::ClassDB::bind_integer_constant(get_class_static(), __constant_get_bitfield_name(m_constant, #m_constant), #m_constant, m_constant, true);
538+
::ClassDB::bind_integer_constant(get_class_static(), __constant_get_bitfield_name(m_constant), #m_constant, m_constant, true);
539539

540540
#define BIND_CONSTANT(m_constant) \
541541
::ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);

‎core/variant/type_info.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ inline String enum_qualified_name_to_class_info_name(const String &p_qualified_n
205205
};
206206

207207
template <typename T>
208-
inline StringName __constant_get_enum_name(T param, const String &p_constant) {
208+
inline StringName __constant_get_enum_name(T param) {
209209
return GetTypeInfo<T>::get_class_info().class_name;
210210
}
211211

@@ -230,7 +230,7 @@ inline StringName __constant_get_enum_name(T param, const String &p_constant) {
230230
};
231231

232232
template <typename T>
233-
inline StringName __constant_get_bitfield_name(T param, const String &p_constant) {
233+
inline StringName __constant_get_bitfield_name(T param) {
234234
return GetTypeInfo<BitField<T>>::get_class_info().class_name;
235235
}
236236
#define CLASS_INFO(m_type) (GetTypeInfo<m_type *>::get_class_info())

0 commit comments

Comments
 (0)