gnulib: define the path to gnulib's parent dir

[binutils-gdb.git] / gdb / ada-exp.h

diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h
index 1ae0cbc354663767608ffda4bc3ff3ccb6d8ad80..598dc7072ad788915439af914dcee09e09f47569 100644 (file)
--- a/gdb/ada-exp.h
+++ b/gdb/ada-exp.h
@@ -1,6 +1,6 @@
 /* Definitions for Ada expressions
 
-   Copyright (C) 2020 Free Software Foundation, Inc.
+   Copyright (C) 2020, 2021 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -213,8 +213,8 @@ using ada_binop_div_operation = binop_operation<BINOP_DIV, ada_mult_binop>;
 using ada_binop_rem_operation = binop_operation<BINOP_REM, ada_mult_binop>;
 using ada_binop_mod_operation = binop_operation<BINOP_MOD, ada_mult_binop>;
 
-using ada_binop_min_operation = binop_operation<OP_ATR_MIN, ada_binop_minmax>;
-using ada_binop_max_operation = binop_operation<OP_ATR_MAX, ada_binop_minmax>;
+using ada_binop_min_operation = binop_operation<BINOP_MIN, ada_binop_minmax>;
+using ada_binop_max_operation = binop_operation<BINOP_MAX, ada_binop_minmax>;
 
 using ada_binop_exp_operation = binop_operation<BINOP_EXP, ada_binop_exp>;
 
@@ -352,7 +352,7 @@ public:
                            enum noside noside) override;
 
   const block *get_block () const
-  { return std::get<1> (m_storage); }
+  { return std::get<0> (m_storage).block; }
 
   bool resolve (struct expression *exp,
                bool deprocedure_p,
@@ -510,11 +510,12 @@ public:
      type, evaluate an assignment of this aggregate's value to LHS.
      CONTAINER is an lvalue containing LHS (possibly LHS itself).
      Does not modify the inferior's memory, nor does it modify the
-     contents of LHS (unless == CONTAINER).  */
+     contents of LHS (unless == CONTAINER).  Returns the modified
+     CONTAINER.  */
 
-  void assign_aggregate (struct value *container,
-                        struct value *lhs,
-                        struct expression *exp);
+  value *assign_aggregate (struct value *container,
+                          struct value *lhs,
+                          struct expression *exp);
 
   value *evaluate (struct type *expect_type,
                   struct expression *exp,