dwarflint: Nits

diff --git a/dwarflint/dwarf_2.cc b/dwarflint/dwarf_2.cc
index 69c45953cd7050be3d5646af55c09346a15f7f64..c39eca6ff710fb5102be0c7bb231b0499a7d3529 100644 (file)
--- a/dwarflint/dwarf_2.cc
+++ b/dwarflint/dwarf_2.cc
@@ -120,10 +120,6 @@ namespace
     {}
   };
 
-  typedef preset_form<sc_value,
-                     cl_constant, cl_lineptr, cl_loclistptr,
-                     cl_macptr> dw2_data_form;
-
   struct dwarf_2_forms
     : public form_table
   {
@@ -136,6 +132,10 @@ namespace
 
       // These constant forms can in theory, in legal DWARF 2,
       // represent various pointers.
+      typedef preset_form<sc_value,
+                         cl_constant, cl_lineptr, cl_loclistptr,
+                         cl_macptr> dw2_data_form;
+
       add (dw2_data_form (DW_FORM_data1, fw_1));
       add (dw2_data_form (DW_FORM_data2, fw_2));
       add (dw2_data_form (DW_FORM_data4, fw_4));

diff --git a/dwarflint/dwarf_3.cc b/dwarflint/dwarf_3.cc
index cf2b753a92c72af8ed2aa68567c8d602348e78b7..7cd3dbee655e2dc1c33648a2bd5dea8118ebb8be 100644 (file)
--- a/dwarflint/dwarf_3.cc
+++ b/dwarflint/dwarf_3.cc
@@ -89,11 +89,6 @@ namespace
     }
   };
 
-  typedef preset_form<sc_value,
-                     cl_constant, cl_lineptr, cl_loclistptr,
-                     cl_macptr, cl_rangelistptr> dw3_data_form;
-  typedef preset_form<sc_block, cl_block, cl_exprloc> locexpr_form;
-
   struct dwarf_3_forms
     : public form_table
   {
@@ -106,6 +101,10 @@ namespace
       // DW_AT_location to have any constant form.  In DWARF 3, only
       // data4 and data8 are like this.  In addition, these two can
       // also be cl_rangelistptr.
+      typedef preset_form<sc_value,
+                         cl_constant, cl_lineptr, cl_loclistptr,
+                         cl_macptr, cl_rangelistptr> dw3_data_form;
+
       add (const_form (DW_FORM_data1, fw_1));
       add (const_form (DW_FORM_data2, fw_2));
       add (dw3_data_form (DW_FORM_data4, fw_4));