Fix "'operator new' should not return NULL" errors in testsuite

[deliverable/binutils-gdb.git] / gdb / cp-support.h

diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 987850730ac10ddf559f5109a3a543f82ab06aa0..6ca898315bb1a8d4f9632e73680eab260167c622 100644 (file)
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -1,5 +1,5 @@
 /* Helper routines for C++ support in GDB.
-   Copyright (C) 2002-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2020 Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
    Namespace support contributed by David Carlton.
@@ -25,7 +25,6 @@
 /* We need this for 'domain_enum', alas...  */
 
 #include "symtab.h"
-#include "gdbsupport/vec.h"
 #include "gdbsupport/gdb_vecs.h"
 #include "gdb_obstack.h"
 #include "gdbsupport/array-view.h"
@@ -78,15 +77,16 @@ struct demangle_parse_info
 
 /* Functions from cp-support.c.  */
 
-extern std::string cp_canonicalize_string (const char *string);
+extern gdb::unique_xmalloc_ptr<char> cp_canonicalize_string
+  (const char *string);
 
-extern std::string cp_canonicalize_string_no_typedefs (const char *string);
+extern gdb::unique_xmalloc_ptr<char> cp_canonicalize_string_no_typedefs
+  (const char *string);
 
 typedef const char *(canonicalization_ftype) (struct type *, void *);
 
-extern std::string cp_canonicalize_string_full (const char *string,
-                                               canonicalization_ftype *finder,
-                                               void *data);
+extern gdb::unique_xmalloc_ptr<char> cp_canonicalize_string_full
+  (const char *string, canonicalization_ftype *finder, void *data);
 
 extern char *cp_class_name_from_physname (const char *physname);