@@ -314,99 +314,6 @@ StringName::StringName(const String &p_name, bool p_static) {
314314 Table::table[idx] = _data;
315315}
316316
317- StringName StringName::search (const char *p_name) {
318- ERR_FAIL_COND_V (!configured, StringName ());
319-
320- ERR_FAIL_NULL_V (p_name, StringName ());
321- if (!p_name[0 ]) {
322- return StringName ();
323- }
324-
325- const uint32_t hash = String::hash (p_name);
326- const uint32_t idx = hash & Table::TABLE_MASK;
327-
328- MutexLock lock (Table::mutex);
329- _Data *_data = Table::table[idx];
330-
331- while (_data) {
332- // compare hash first
333- if (_data->hash == hash && _data->name == p_name) {
334- break ;
335- }
336- _data = _data->next ;
337- }
338-
339- if (_data && _data->refcount .ref ()) {
340- #ifdef DEBUG_ENABLED
341- if (unlikely (debug_stringname)) {
342- _data->debug_references ++;
343- }
344- #endif
345-
346- return StringName (_data);
347- }
348-
349- return StringName (); // does not exist
350- }
351-
352- StringName StringName::search (const char32_t *p_name) {
353- ERR_FAIL_COND_V (!configured, StringName ());
354-
355- ERR_FAIL_NULL_V (p_name, StringName ());
356- if (!p_name[0 ]) {
357- return StringName ();
358- }
359-
360- const uint32_t hash = String::hash (p_name);
361- const uint32_t idx = hash & Table::TABLE_MASK;
362-
363- MutexLock lock (Table::mutex);
364- _Data *_data = Table::table[idx];
365-
366- while (_data) {
367- // compare hash first
368- if (_data->hash == hash && _data->name == p_name) {
369- break ;
370- }
371- _data = _data->next ;
372- }
373-
374- if (_data && _data->refcount .ref ()) {
375- return StringName (_data);
376- }
377-
378- return StringName (); // does not exist
379- }
380-
381- StringName StringName::search (const String &p_name) {
382- ERR_FAIL_COND_V (p_name.is_empty (), StringName ());
383-
384- const uint32_t hash = p_name.hash ();
385- const uint32_t idx = hash & Table::TABLE_MASK;
386-
387- MutexLock lock (Table::mutex);
388- _Data *_data = Table::table[idx];
389-
390- while (_data) {
391- // compare hash first
392- if (_data->hash == hash && _data->name == p_name) {
393- break ;
394- }
395- _data = _data->next ;
396- }
397-
398- if (_data && _data->refcount .ref ()) {
399- #ifdef DEBUG_ENABLED
400- if (unlikely (debug_stringname)) {
401- _data->debug_references ++;
402- }
403- #endif
404- return StringName (_data);
405- }
406-
407- return StringName (); // does not exist
408- }
409-
410317bool operator ==(const String &p_name, const StringName &p_string_name) {
411318 return p_string_name.operator ==(p_name);
412319}
0 commit comments