Rename SEARCH_ALL

The constant SEARCH_ALL conflicts with a define in a Windows header.
This patch renames the constant to SEARCH_ALL_DOMAINS to avoid the
conflict.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31307
This commit is contained in:
Tom Tromey 2024-01-29 09:45:35 -07:00
parent 05d1b4b4ad
commit f214edceb8
7 changed files with 9 additions and 9 deletions

View File

@ -13533,7 +13533,7 @@ class ada_language : public language_defn
NULL,
NULL,
SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK,
SEARCH_ALL);
SEARCH_ALL_DOMAINS);
/* At this point scan through the misc symbol vectors and add each
symbol you find to the list. Eventually we want to ignore

View File

@ -368,7 +368,7 @@ gcc_cplus_convert_symbol (void *datum,
symbol_searcher searcher;
searcher.find_all_symbols (identifier, current_language,
SEARCH_ALL, nullptr, nullptr);
SEARCH_ALL_DOMAINS, nullptr, nullptr);
/* Convert any found symbols. */
for (const auto &it : searcher.matching_symbols ())

View File

@ -600,7 +600,7 @@ gdbpy_lookup_static_symbols (PyObject *self, PyObject *args, PyObject *kw)
lookup_name_info lookup_name (name, symbol_name_match_type::FULL);
expand_symtabs_matching (NULL, lookup_name, NULL, NULL,
SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK,
SEARCH_ALL);
SEARCH_ALL_DOMAINS);
for (objfile *objfile : current_program_space->objfiles ())
{

View File

@ -222,7 +222,7 @@ objfile::map_symtabs_matching_filename
on_expansion,
(SEARCH_GLOBAL_BLOCK
| SEARCH_STATIC_BLOCK),
SEARCH_ALL))
SEARCH_ALL_DOMAINS))
{
retval = false;
break;
@ -378,7 +378,7 @@ objfile::expand_symtabs_with_fullname (const char *fullname)
nullptr,
(SEARCH_GLOBAL_BLOCK
| SEARCH_STATIC_BLOCK),
SEARCH_ALL);
SEARCH_ALL_DOMAINS);
}
bool

View File

@ -919,7 +919,7 @@ maintenance_expand_symtabs (const char *args, int from_tty)
NULL,
NULL,
SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK,
SEARCH_ALL);
SEARCH_ALL_DOMAINS);
}

View File

@ -5993,7 +5993,7 @@ default_collect_symbol_completion_matches_break_on
return true;
},
SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK,
SEARCH_ALL);
SEARCH_ALL_DOMAINS);
/* Search upwards from currently selected frame (so that we can
complete on local vars). Also catch fields of types defined in

View File

@ -917,7 +917,7 @@ enum domain_search_flag
DEF_ENUM_FLAGS_TYPE (enum domain_search_flag, domain_search_flags);
/* A convenience constant to search for any symbol. */
constexpr domain_search_flags SEARCH_ALL
constexpr domain_search_flags SEARCH_ALL_DOMAINS
= ((domain_search_flags) 0
#define SYM_DOMAIN(X) | SEARCH_ ## X ## _DOMAIN
#include "sym-domains.def"
@ -958,7 +958,7 @@ search_flags_matches (domain_search_flags flags, domain_enum domain)
/* The flag bit. */
constexpr int SCRIPTING_SEARCH_FLAG = 0x8000;
static_assert (SCRIPTING_SEARCH_FLAG > SEARCH_ALL);
static_assert (SCRIPTING_SEARCH_FLAG > SEARCH_ALL_DOMAINS);
/* Convert a domain constant to a "scripting domain". */
static constexpr inline int