#define CP_ANONYMOUS_NAMESPACE_LEN 21
+/* A string representing the start of an operator name. */
+
+#define CP_OPERATOR_STR "operator"
+
+/* The length of CP_OPERATOR_STR. */
+
+#define CP_OPERATOR_LEN 8
+
/* The result of parsing a name. */
struct demangle_parse_info
extern char *cp_func_name (const char *full_name);
-extern char *cp_remove_params (const char *demangled_name);
+extern gdb::unique_xmalloc_ptr<char> cp_remove_params
+ (const char *demanged_name);
extern struct symbol **make_symbol_overload_list (const char *,
const char *);
extern std::unique_ptr<demangle_parse_info> cp_demangled_name_to_comp
(const char *demangled_name, const char **errmsg);
-extern char *cp_comp_to_string (struct demangle_component *result,
- int estimated_len);
+extern gdb::unique_xmalloc_ptr<char> cp_comp_to_string
+ (struct demangle_component *result, int estimated_len);
extern void cp_merge_demangle_parse_infos (struct demangle_parse_info *,
struct demangle_component *,