Make gdb.mi/user-selected-context-sync.exp use proc_with_prefix

[deliverable/binutils-gdb.git] / gdb / ctf.c

diff --git a/gdb/ctf.c b/gdb/ctf.c
index 795c365ab3a636b294e3b5b06cd0360aaf22b469..7daa47e28a411400ad83db7f8d3f25afa3901e60 100644 (file)
--- a/gdb/ctf.c
+++ b/gdb/ctf.c
@@ -29,8 +29,8 @@
 #include "inferior.h"
 #include "gdbthread.h"
 #include "tracefile.h"
-
 #include <ctype.h>
+#include <algorithm>
 
 /* GDB saves trace buffers and other information (such as trace
    status) got from the remote target into Common Trace Format (CTF).
@@ -1397,7 +1397,7 @@ ctf_xfer_partial (struct target_ops *ops, enum target_object object,
         and this address falls within a read-only section, fallback
         to reading from executable, up to LOW_ADDR_AVAILABLE  */
       if (offset < low_addr_available)
-       len = min (len, low_addr_available - offset);
+       len = std::min (len, low_addr_available - offset);
       res = exec_read_partial_read_only (readbuf, offset, len, xfered_len);
 
       if (res == TARGET_XFER_OK)
@@ -1692,7 +1692,7 @@ ctf_traceframe_info (struct target_ops *self)
          const struct bt_definition *def;
 
          def = bt_ctf_get_field (event, scope, "num");
-         vnum = (int) bt_ctf_get_int64 (def);
+         vnum = (int) bt_ctf_get_uint64 (def);
          VEC_safe_push (int, info->tvars, vnum);
        }
       else