diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2017-09-22 17:00:33 -0300 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2017-09-22 17:00:33 -0300 |
| commit | 9e0703de64a6dd4deae2ebd569955f14337f2710 (patch) | |
| tree | cec45139f1febef6441deabae142c3fb3f2c61f3 /gdb/annotate.h | |
| parent | 13b9f79a1904081d984a64037af6457c1e3ff7b6 (diff) | |
| parent | 43573013c9836f2b91b74b9b29dac35fdb41e06b (diff) | |
| download | gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.zip gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.tar.gz gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.tar.bz2 | |
Merge remote-tracking branch 'remotes/master' into users/aoliva/SFN
Updated local changes to binutils/testsuite/binutils-all/readelf.exp
to match the unresolved (failed to assemble) messages introduced by
Alan Modra.
Diffstat (limited to 'gdb/annotate.h')
| -rw-r--r-- | gdb/annotate.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gdb/annotate.h b/gdb/annotate.h index 7161689..8a9a641 100644 --- a/gdb/annotate.h +++ b/gdb/annotate.h @@ -81,8 +81,7 @@ struct annotate_arg_emitter annotate_arg_emitter () { annotate_arg_begin (); } ~annotate_arg_emitter () { annotate_arg_end (); } - annotate_arg_emitter (const annotate_arg_emitter &) = delete; - annotate_arg_emitter &operator= (const annotate_arg_emitter &) = delete; + DISABLE_COPY_AND_ASSIGN (annotate_arg_emitter); }; extern void annotate_source (char *, int, int, int, |