X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fax.h;h=65868938dded26314423cc6abfcc270738ef44fc;hb=d835a58baae720abe909795cb68763040d1750a8;hp=85d294352a8275e2ba1566d917c608540b7bdc98;hpb=3cde5c42d1c1ddcf8bbde5c47233c644370c959c;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/ax.h b/gdb/ax.h
index 85d294352a..65868938dd 100644
--- a/gdb/ax.h
+++ b/gdb/ax.h
@@ -1,5 +1,5 @@
 /* Definitions for expressions designed to be executed on the agent
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
+   Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,11 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AGENTEXPR_H
-#define AGENTEXPR_H
-
-#include "doublest.h"		/* For DOUBLEST.  */
-#include "vec.h"
+#ifndef AX_H
+#define AX_H
 
 /* It's sometimes useful to be able to debug programs that you can't
    really stop for more than a fraction of a second.  To this end, the
@@ -80,17 +77,6 @@ enum agent_flaws
 
 /* Agent expression data structures.  */
 
-/* The type of an element of the agent expression stack.
-   The bytecode operation indicates which element we should access;
-   the value itself has no typing information.  GDB generates all
-   bytecode streams, so we don't have to worry about type errors.  */
-
-union agent_val
-  {
-    LONGEST l;
-    DOUBLEST d;
-  };
-
 /* A buffer containing a agent expression.  */
 struct agent_expr
   {
@@ -168,7 +154,7 @@ struct agent_expr
   };
 
 /* An agent_expr owning pointer.  */
-typedef gdb::unique_ptr<agent_expr> agent_expr_up;
+typedef std::unique_ptr<agent_expr> agent_expr_up;
 
 /* The actual values of the various bytecode operations.  */
 
@@ -176,7 +162,7 @@ enum agent_op
   {
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  \
     aop_ ## NAME = VALUE,
-#include "ax.def"
+#include "gdbsupport/ax.def"
 #undef DEFOP
     aop_last
   };
@@ -279,4 +265,4 @@ extern struct aop_map aop_map[];
 
 extern void ax_reqs (struct agent_expr *ax);
 
-#endif /* AGENTEXPR_H */
+#endif /* AX_H */