* stabsread.c (get_substring): Declare second arg as int.

[deliverable/binutils-gdb.git] / gdb / cp-valprint.c

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index f68b7530138216b6434af166c30a5a84138a385c..48f490518c6c2e083213d2f2c8167059656c40a6 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -1,5 +1,5 @@
 /* Support for printing C++ values for GDB, the GNU debugger.
-   Copyright 1986, 1988, 1989, 1991, 1994, 1995
+   Copyright 1986, 1988, 1989, 1991, 1994, 1995, 1996
    Free Software Foundation, Inc.
 
 This file is part of GDB.
@@ -124,7 +124,7 @@ cp_print_class_method (valaddr, type, stream)
       c_type_print_varspec_prefix (TYPE_FN_FIELD_TYPE (f, j), stream, 0, 0);
       fprintf_unfiltered (stream, kind);
       if (TYPE_FN_FIELD_PHYSNAME (f, j)[0] == '_'
-         && TYPE_FN_FIELD_PHYSNAME (f, j)[1] == CPLUS_MARKER)
+         && is_cplus_marker (TYPE_FN_FIELD_PHYSNAME (f, j)[1]))
        {
          cp_type_print_method_args (TYPE_FN_FIELD_ARGS (f, j) + 1, "~",
                                     TYPE_FN_FIELDLIST_NAME (domain, i),
@@ -499,7 +499,7 @@ cp_print_static_field (type, val, stream, format, recurse, pretty)
            }
        }
 
-      obstack_grow (&dont_print_statmem_obstack, &VALUE_ADDRESS (val),
+      obstack_grow (&dont_print_statmem_obstack, (char *) &VALUE_ADDRESS (val),
                    sizeof (CORE_ADDR));
 
       CHECK_TYPEDEF (type);